summaryrefslogtreecommitdiff
path: root/java/openjdk7/files
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2014-04-20 22:56:18 +0000
committerGreg Lewis <glewis@FreeBSD.org>2014-04-20 22:56:18 +0000
commit95e1070605627cc8a0b182b1da407fa602b5b938 (patch)
tree211346d2d023906e731f559303a886f5739bf66f /java/openjdk7/files
parent. Update to the cacerts file included in the latest Linux distribution (7u55). (diff)
. Update to 7u55.
. Use version 1.9.3 of ant [1] . Don't insist on GCC since compilation with clang now works [2]. Obtained from: jkim@'s openjdk7 redport repo ([1], [2])
Notes
Notes: svn path=/head/; revision=351655
Diffstat (limited to 'java/openjdk7/files')
-rw-r--r--java/openjdk7/files/patch-set44698
-rw-r--r--java/openjdk7/files/patch-src-solaris-classes-sun-net-PortConfig.java13
2 files changed, 17525 insertions, 27186 deletions
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index a448ab429cc4..f3059d4cd5f8 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,5 +1,5 @@
--- .hgtags 2013-09-06 11:20:33.000000000 -0700
-+++ .hgtags 2014-01-18 12:16:04.000000000 -0800
++++ .hgtags 2014-04-20 12:39:52.000000000 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -40,7 +40,7 @@
da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
-@@ -341,3 +358,37 @@
+@@ -341,3 +358,59 @@
3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
@@ -65,6 +65,9 @@
+f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
+f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
++b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33
++05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34
++d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
+c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
+f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
@@ -78,8 +81,27 @@
+9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
+573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
++6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
++d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
++626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
++df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u55-b00
++15bc13cd7f5d0bb06ab59935e25944fa7cb15bc8 jdk7u55-b01
++b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
++a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03
++6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04
++92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05
++6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06
++5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07
++f617c33f98e1941875457c5c227198c52917942e jdk7u55-b08
++1f02b1889f7098c1e6fdd271ef74c62a2e346b28 jdk7u55-b09
++736c951b19b9562830f61d5ebbad78775f200e94 jdk7u55-b09
++2a55bbab15f6c866281003dcf48708a9d8c145e9 jdk7u55-b10
++f4ace62029de00d2497058c3c0e1d26e019cde30 jdk7u55-b11
++de268da51b54a4f36bcc1a9af60faea285e94330 jdk7u55-b12
++d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
++0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
--- Makefile 2013-09-06 11:20:33.000000000 -0700
-+++ Makefile 2013-12-01 11:13:37.000000000 -0800
++++ Makefile 2014-04-20 12:39:52.000000000 -0700
@@ -264,7 +264,7 @@
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
@@ -90,7 +112,7 @@
generic_build_repo_series
--- corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
-+++ corba/.hgtags 2014-01-18 12:16:06.000000000 -0800
++++ corba/.hgtags 2014-04-20 12:39:46.000000000 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -122,7 +144,7 @@
ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
-@@ -343,3 +360,38 @@
+@@ -343,3 +360,60 @@
b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
@@ -148,6 +170,9 @@
+80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
+a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
++d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33
++aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34
++fab1423e6ab8ecf36da8b6bf2e454156ec701e8a jdk7u45-b35
+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
+8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
+327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
@@ -161,8 +186,27 @@
+eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
+a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
++e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
++6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
++0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
++55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u55-b00
++aabfdc799c0799837dcbbf9ea8d6df1511978b1f jdk7u55-b01
++db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
++02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
++6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
++a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05
++af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06
++44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07
++aa98fb8dc3608a30ac593635b21aca2105aaab20 jdk7u55-b08
++2a4842e7ca0b2228017542cea0fed3b8d4f4491a jdk7u55-b09
++5805c3291eb3a82cd75e95ac06eb13daa7f92866 jdk7u55-b09
++b9dae31c56a2bf69fc5932cc490cd80fccc1e0fd jdk7u55-b10
++cbd5b4b07e0c8a5f61eff396b7622e7b04d2a164 jdk7u55-b11
++3cce2a49d18d93dfca2634db32368486ebbb1590 jdk7u55-b12
++8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
++e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
--- corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
-+++ corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800
++++ corba/make/Makefile 2014-04-20 12:39:43.000000000 -0700
@@ -160,7 +160,7 @@
#
# CORBA
@@ -173,7 +217,7 @@
build:
$(SUBDIRS-loop)
--- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -82,11 +82,18 @@
super((ORB)orb);
}
@@ -199,7 +243,7 @@
}
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -230,7 +274,7 @@
protected CodeSetConversion.BTCConverter createCharBTCConverter() {
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -265,7 +309,7 @@
protected CodeSetConversion.CTBConverter createCharCTBConverter() {
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -301,7 +345,7 @@
encap.setEnclosingInputStream(is);
encap.makeEncapsulation();
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -61,6 +61,8 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
@@ -325,7 +369,7 @@
//System.out.println("Created TypeCodeInputStream " + tcis + " with no parent");
//tcis.printBuffer();
--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-04-20 12:39:43.000000000 -0700
@@ -33,6 +33,8 @@
import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
import com.sun.corba.se.spi.logging.CORBALogDomains;
@@ -348,7 +392,7 @@
cdrIn.consumeEndian();
--- corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -411,7 +455,7 @@
com.sun.org.omg.SendingContext.CodeBase sender,
int offset)
--- corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-04-20 12:39:43.000000000 -0700
@@ -201,7 +201,7 @@
readObjectState.endDefaultReadObject(this);
}
@@ -421,8 +465,396 @@
abstract void readFields(java.util.Map fieldToValueMap)
throws java.io.InvalidClassException, java.io.StreamCorruptedException,
+--- corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -52,6 +52,7 @@
+ import java.io.DataOutputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.InvalidClassException;
++import java.io.Externalizable;
+ import java.io.Serializable;
+
+ import java.util.Arrays;
+@@ -82,15 +83,15 @@
+ public static final long kDefaultUID = -1;
+
+ private static Object noArgsList[] = {};
+- private static Class noTypesList[] = {};
++ private static Class<?> noTypesList[] = {};
+
+ /** true if represents enum type */
+ private boolean isEnum;
+
+ private static final Bridge bridge =
+- (Bridge)AccessController.doPrivileged(
+- new PrivilegedAction() {
+- public Object run() {
++ AccessController.doPrivileged(
++ new PrivilegedAction<Bridge>() {
++ public Bridge run() {
+ return Bridge.get() ;
+ }
+ }
+@@ -100,7 +101,7 @@
+ * is returned if the specified class does not implement
+ * java.io.Serializable or java.io.Externalizable.
+ */
+- static final ObjectStreamClass lookup(Class cl)
++ static final ObjectStreamClass lookup(Class<?> cl)
+ {
+ ObjectStreamClass desc = lookupInternal(cl);
+ if (desc.isSerializable() || desc.isExternalizable())
+@@ -112,7 +113,7 @@
+ * Find the class descriptor for the specified class.
+ * Package access only so it can be called from ObjectIn/OutStream.
+ */
+- static ObjectStreamClass lookupInternal(Class cl)
++ static ObjectStreamClass lookupInternal(Class<?> cl)
+ {
+ /* Synchronize on the hashtable so no two threads will do
+ * this at the same time.
+@@ -123,14 +124,14 @@
+ desc = findDescriptorFor(cl);
+ if (desc == null) {
+ /* Check if it's serializable */
+- boolean serializable = classSerializable.isAssignableFrom(cl);
++ boolean serializable = Serializable.class.isAssignableFrom(cl);
+
+ /* If the class is only Serializable,
+ * lookup the descriptor for the superclass.
+ */
+ ObjectStreamClass superdesc = null;
+ if (serializable) {
+- Class superclass = cl.getSuperclass();
++ Class<?> superclass = cl.getSuperclass();
+ if (superclass != null)
+ superdesc = lookup(superclass);
+ }
+@@ -143,7 +144,7 @@
+ if (serializable) {
+ externalizable =
+ ((superdesc != null) && superdesc.isExternalizable()) ||
+- classExternalizable.isAssignableFrom(cl);
++ Externalizable.class.isAssignableFrom(cl);
+ if (externalizable) {
+ serializable = false;
+ }
+@@ -187,7 +188,7 @@
+ * that have evolved from a common root class and agree to be serialized
+ * and deserialized using a common format.
+ */
+- public static final long getSerialVersionUID( java.lang.Class clazz) {
++ public static final long getSerialVersionUID( java.lang.Class<?> clazz) {
+ ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
+ if( theosc != null )
+ {
+@@ -221,7 +222,7 @@
+ /**
+ * Return the actual (computed) serialVersionUID for this class.
+ */
+- public static final long getActualSerialVersionUID( java.lang.Class clazz )
++ public static final long getActualSerialVersionUID( java.lang.Class<?> clazz )
+ {
+ ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
+ if( theosc != null )
+@@ -251,7 +252,7 @@
+ * Return the class in the local VM that this version is mapped to.
+ * Null is returned if there is no corresponding local class.
+ */
+- public final Class forClass() {
++ public final Class<?> forClass() {
+ return ofClass;
+ }
+
+@@ -351,7 +352,7 @@
+ * Create a new ObjectStreamClass from a loaded class.
+ * Don't call this directly, call lookup instead.
+ */
+- private ObjectStreamClass(java.lang.Class cl, ObjectStreamClass superdesc,
++ private ObjectStreamClass(java.lang.Class<?> cl, ObjectStreamClass superdesc,
+ boolean serial, boolean extern)
+ {
+ ofClass = cl; /* created from this class */
+@@ -390,7 +391,7 @@
+
+ PersistentFieldsValue() { }
+
+- ObjectStreamField[] get(Class type) {
++ ObjectStreamField[] get(Class<?> type) {
+ Object value = map.get(type);
+ if (value == null) {
+ value = computeValue(type);
+@@ -448,7 +449,7 @@
+ if (initialized)
+ return;
+
+- final Class cl = ofClass;
++ final Class<?> cl = ofClass;
+
+ if (!serializable ||
+ externalizable ||
+@@ -576,9 +577,9 @@
+ * will call it as necessary.
+ */
+ writeObjectMethod = getPrivateMethod( cl, "writeObject",
+- new Class[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
++ new Class<?>[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
+ readObjectMethod = getPrivateMethod( cl, "readObject",
+- new Class[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
++ new Class<?>[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
+ }
+ return null;
+ }
+@@ -604,9 +605,9 @@
+ * class, or null if none found. Access checks are disabled on the
+ * returned method (if any).
+ */
+- private static Method getPrivateMethod(Class cl, String name,
+- Class[] argTypes,
+- Class returnType)
++ private static Method getPrivateMethod(Class<?> cl, String name,
++ Class<?>[] argTypes,
++ Class<?> returnType)
+ {
+ try {
+ Method meth = cl.getDeclaredMethod(name, argTypes);
+@@ -667,7 +668,7 @@
+ * Fill in the reflected Fields that will be used
+ * for reading.
+ */
+- final void setClass(Class cl) throws InvalidClassException {
++ final void setClass(Class<?> cl) throws InvalidClassException {
+
+ if (cl == null) {
+ localClassDesc = null;
+@@ -934,9 +935,9 @@
+ * Access checks are disabled on the returned constructor (if any), since
+ * the defining class may still be non-public.
+ */
+- private static Constructor getExternalizableConstructor(Class cl) {
++ private static Constructor getExternalizableConstructor(Class<?> cl) {
+ try {
+- Constructor cons = cl.getDeclaredConstructor(new Class[0]);
++ Constructor cons = cl.getDeclaredConstructor(new Class<?>[0]);
+ cons.setAccessible(true);
+ return ((cons.getModifiers() & Modifier.PUBLIC) != 0) ?
+ cons : null;
+@@ -950,15 +951,15 @@
+ * superclass, or null if none found. Access checks are disabled on the
+ * returned constructor (if any).
+ */
+- private static Constructor getSerializableConstructor(Class cl) {
+- Class initCl = cl;
++ private static Constructor getSerializableConstructor(Class<?> cl) {
++ Class<?> initCl = cl;
+ while (Serializable.class.isAssignableFrom(initCl)) {
+ if ((initCl = initCl.getSuperclass()) == null) {
+ return null;
+ }
+ }
+ try {
+- Constructor cons = initCl.getDeclaredConstructor(new Class[0]);
++ Constructor cons = initCl.getDeclaredConstructor(new Class<?>[0]);
+ int mods = cons.getModifiers();
+ if ((mods & Modifier.PRIVATE) != 0 ||
+ ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 &&
+@@ -1063,7 +1064,7 @@
+ * items to the hash accumulating in the digest stream.
+ * Fold the hash into a long. Use the SHA secure hash function.
+ */
+- private static long _computeSerialVersionUID(Class cl) {
++ private static long _computeSerialVersionUID(Class<?> cl) {
+ if (DEBUG_SVUID)
+ msg( "Computing SerialVersionUID for " + cl ) ;
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+@@ -1117,7 +1118,7 @@
+ * them from its computation.
+ */
+
+- Class interfaces[] = cl.getInterfaces();
++ Class<?> interfaces[] = cl.getInterfaces();
+ Arrays.sort(interfaces, compareClassByName);
+
+ for (int i = 0; i < interfaces.length; i++) {
+@@ -1247,7 +1248,7 @@
+ return h;
+ }
+
+- private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class cl) {
++ private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -1267,7 +1268,7 @@
+ DataOutputStream data = new DataOutputStream(mdo);
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null))
+ // SerialBug 1; acc. to spec the one for
+ // java.lang.object
+@@ -1323,10 +1324,10 @@
+ /**
+ * Compute the JVM signature for the class.
+ */
+- static String getSignature(Class clazz) {
++ static String getSignature(Class<?> clazz) {
+ String type = null;
+ if (clazz.isArray()) {
+- Class cl = clazz;
++ Class<?> cl = clazz;
+ int dimensions = 0;
+ while (cl.isArray()) {
+ dimensions++;
+@@ -1372,7 +1373,7 @@
+
+ sb.append("(");
+
+- Class[] params = meth.getParameterTypes(); // avoid clone
++ Class<?>[] params = meth.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -1389,7 +1390,7 @@
+
+ sb.append("(");
+
+- Class[] params = cons.getParameterTypes(); // avoid clone
++ Class<?>[] params = cons.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -1409,7 +1410,7 @@
+ * The entries are extended from java.lang.ref.SoftReference so the
+ * gc will be able to free them if needed.
+ */
+- private static ObjectStreamClass findDescriptorFor(Class cl) {
++ private static ObjectStreamClass findDescriptorFor(Class<?> cl) {
+
+ int hash = cl.hashCode();
+ int index = (hash & 0x7FFFFFFF) % descriptorFor.length;
+@@ -1456,7 +1457,7 @@
+ descriptorFor[index] = e;
+ }
+
+- private static Field[] getDeclaredFields(final Class clz) {
++ private static Field[] getDeclaredFields(final Class<?> clz) {
+ return (Field[]) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return clz.getDeclaredFields();
+@@ -1490,7 +1491,7 @@
+ /*
+ * Class that is a descriptor for in this virtual machine.
+ */
+- private Class ofClass;
++ private Class<?> ofClass;
+
+ /*
+ * True if descriptor for a proxy class.
+@@ -1562,30 +1563,17 @@
+ * Returns true if the given class defines a static initializer method,
+ * false otherwise.
+ */
+- private static boolean hasStaticInitializer(Class cl) {
++ private static boolean hasStaticInitializer(Class<?> cl) {
+ if (hasStaticInitializerMethod == null) {
+- Class classWithThisMethod = null;
++ Class<?> classWithThisMethod = null;
+
+ try {
+- try {
+- // When using rip-int with Merlin or when this is a Merlin
+- // workspace, the method we want is in sun.misc.ClassReflector
+- // and absent from java.io.ObjectStreamClass.
+- //
+- // When compiling rip-int with JDK 1.3.x, we have to get it
+- // from java.io.ObjectStreamClass.
+- classWithThisMethod = Class.forName("sun.misc.ClassReflector");
+- } catch (ClassNotFoundException cnfe) {
+- // Do nothing. This is either not a Merlin workspace,
+- // or rip-int is being compiled with something other than
+- // Merlin, probably JDK 1.3. Fall back on java.io.ObjectStreaClass.
+- }
+ if (classWithThisMethod == null)
+ classWithThisMethod = java.io.ObjectStreamClass.class;
+
+ hasStaticInitializerMethod =
+ classWithThisMethod.getDeclaredMethod("hasStaticInitializer",
+- new Class[] { Class.class });
++ new Class<?>[] { Class.class });
+ } catch (NoSuchMethodException ex) {
+ }
+
+@@ -1610,22 +1598,6 @@
+ }
+
+
+- /* The Class Object for java.io.Serializable */
+- private static Class classSerializable = null;
+- private static Class classExternalizable = null;
+-
+- /*
+- * Resolve java.io.Serializable at load time.
+- */
+- static {
+- try {
+- classSerializable = Class.forName("java.io.Serializable");
+- classExternalizable = Class.forName("java.io.Externalizable");
+- } catch (Throwable e) {
+- System.err.println("Could not load java.io.Serializable or java.io.Externalizable.");
+- }
+- }
+-
+ /** use serialVersionUID from JDK 1.1. for interoperability */
+ private static final long serialVersionUID = -6120832682080437368L;
+
+@@ -1663,8 +1635,8 @@
+
+ private static class CompareClassByName implements Comparator {
+ public int compare(Object o1, Object o2) {
+- Class c1 = (Class)o1;
+- Class c2 = (Class)o2;
++ Class<?> c1 = (Class)o1;
++ Class<?> c2 = (Class)o2;
+ return (c1.getName()).compareTo(c2.getName());
+ }
+ }
+@@ -1778,12 +1750,12 @@
+ *
+ * Copied from the Merlin java.io.ObjectStreamClass.
+ */
+- private static Method getInheritableMethod(Class cl, String name,
+- Class[] argTypes,
+- Class returnType)
++ private static Method getInheritableMethod(Class<?> cl, String name,
++ Class<?>[] argTypes,
++ Class<?> returnType)
+ {
+ Method meth = null;
+- Class defCl = cl;
++ Class<?> defCl = cl;
+ while (defCl != null) {
+ try {
+ meth = defCl.getDeclaredMethod(name, argTypes);
+@@ -1815,7 +1787,7 @@
+ *
+ * Copied from the Merlin java.io.ObjectStreamClass.
+ */
+- private static boolean packageEquals(Class cl1, Class cl2) {
++ private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
+ Package pkg1 = cl1.getPackage(), pkg2 = cl2.getPackage();
+ return ((pkg1 == pkg2) || ((pkg1 != null) && (pkg1.equals(pkg2))));
+ }
--- corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -451,7 +883,7 @@
return result ;
}
--- corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-04-20 12:39:44.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -478,7 +910,7 @@
ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ;
if (oktemp == null)
--- corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -70,6 +70,8 @@
import com.sun.corba.se.impl.encoding.EncapsInputStream ;
import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
@@ -499,8 +931,302 @@
istr.consumeEndian();
init( istr ) ;
}
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2013-09-06 11:20:49.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -94,7 +94,7 @@
+ });
+ }
+
+- public static long computeStructuralUID(boolean hasWriteObject, Class cl) {
++ public static long computeStructuralUID(boolean hasWriteObject, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -119,7 +119,7 @@
+ // Object method in there
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null) && (parent != java.lang.Object.class)) {
+ boolean hasWriteObjectFlag = false;
+ Class [] args = {java.io.ObjectOutputStream.class};
+@@ -503,19 +503,6 @@
+ Class classWithThisMethod = null;
+
+ try {
+- try {
+- // When using rip-int with Merlin or when this is a Merlin
+- // workspace, the method we want is in sun.misc.ClassReflector
+- // and absent from java.io.ObjectStreamClass.
+- //
+- // When compiling rip-int with JDK 1.3.x, we have to get it
+- // from java.io.ObjectStreamClass.
+- classWithThisMethod = Class.forName("sun.misc.ClassReflector");
+- } catch (ClassNotFoundException cnfe) {
+- // Do nothing. This is either not a Merlin workspace,
+- // or rip-int is being compiled with something other than
+- // Merlin, probably JDK 1.3. Fall back on java.io.ObjectStreaClass.
+- }
+ if (classWithThisMethod == null)
+ classWithThisMethod = java.io.ObjectStreamClass.class;
+
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-09-06 11:20:49.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -53,6 +53,7 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.InvalidClassException;
+ import java.io.Serializable;
++import java.io.Externalizable;
+
+ import java.util.Arrays;
+ import java.util.Comparator;
+@@ -88,7 +89,7 @@
+ public static final long kDefaultUID = -1;
+
+ private static Object noArgsList[] = {};
+- private static Class noTypesList[] = {};
++ private static Class<?> noTypesList[] = {};
+
+ private static Hashtable translatedFields;
+
+@@ -96,7 +97,7 @@
+ * is returned if the specified class does not implement
+ * java.io.Serializable or java.io.Externalizable.
+ */
+- static final ObjectStreamClass_1_3_1 lookup(Class cl)
++ static final ObjectStreamClass_1_3_1 lookup(Class<?> cl)
+ {
+ ObjectStreamClass_1_3_1 desc = lookupInternal(cl);
+ if (desc.isSerializable() || desc.isExternalizable())
+@@ -108,7 +109,7 @@
+ * Find the class descriptor for the specified class.
+ * Package access only so it can be called from ObjectIn/OutStream.
+ */
+- static ObjectStreamClass_1_3_1 lookupInternal(Class cl)
++ static ObjectStreamClass_1_3_1 lookupInternal(Class<?> cl)
+ {
+ /* Synchronize on the hashtable so no two threads will do
+ * this at the same time.
+@@ -122,13 +123,13 @@
+ }
+
+ /* Check if it's serializable */
+- boolean serializable = classSerializable.isAssignableFrom(cl);
++ boolean serializable = Serializable.class.isAssignableFrom(cl);
+ /* If the class is only Serializable,
+ * lookup the descriptor for the superclass.
+ */
+ ObjectStreamClass_1_3_1 superdesc = null;
+ if (serializable) {
+- Class superclass = cl.getSuperclass();
++ Class<?> superclass = cl.getSuperclass();
+ if (superclass != null)
+ superdesc = lookup(superclass);
+ }
+@@ -141,7 +142,7 @@
+ if (serializable) {
+ externalizable =
+ ((superdesc != null) && superdesc.isExternalizable()) ||
+- classExternalizable.isAssignableFrom(cl);
++ Externalizable.class.isAssignableFrom(cl);
+ if (externalizable) {
+ serializable = false;
+ }
+@@ -170,7 +171,7 @@
+ * that have evolved from a common root class and agree to be serialized
+ * and deserialized using a common format.
+ */
+- public static final long getSerialVersionUID( java.lang.Class clazz) {
++ public static final long getSerialVersionUID( java.lang.Class<?> clazz) {
+ ObjectStreamClass_1_3_1 theosc = ObjectStreamClass_1_3_1.lookup( clazz );
+ if( theosc != null )
+ {
+@@ -204,7 +205,7 @@
+ /**
+ * Return the actual (computed) serialVersionUID for this class.
+ */
+- public static final long getActualSerialVersionUID( java.lang.Class clazz )
++ public static final long getActualSerialVersionUID( java.lang.Class<?> clazz )
+ {
+ ObjectStreamClass_1_3_1 theosc = ObjectStreamClass_1_3_1.lookup( clazz );
+ if( theosc != null )
+@@ -234,7 +235,7 @@
+ * Return the class in the local VM that this version is mapped to.
+ * Null is returned if there is no corresponding local class.
+ */
+- public final Class forClass() {
++ public final Class<?> forClass() {
+ return ofClass;
+ }
+
+@@ -333,7 +334,7 @@
+ * Create a new ObjectStreamClass_1_3_1 from a loaded class.
+ * Don't call this directly, call lookup instead.
+ */
+- private ObjectStreamClass_1_3_1(java.lang.Class cl, ObjectStreamClass_1_3_1 superdesc,
++ private ObjectStreamClass_1_3_1(java.lang.Class<?> cl, ObjectStreamClass_1_3_1 superdesc,
+ boolean serial, boolean extern)
+ {
+ ofClass = cl; /* created from this class */
+@@ -376,7 +377,7 @@
+ private void init() {
+ synchronized (lock) {
+
+- final Class cl = ofClass;
++ final Class<?> cl = ofClass;
+
+ if (fields != null) // already initialized
+ return;
+@@ -558,7 +559,7 @@
+ * will call it as necessary.
+ */
+ try {
+- Class[] args = {java.io.ObjectOutputStream.class};
++ Class<?>[] args = {java.io.ObjectOutputStream.class};
+ writeObjectMethod = cl.getDeclaredMethod("writeObject", args);
+ hasWriteObjectMethod = true;
+ int mods = writeObjectMethod.getModifiers();
+@@ -578,7 +579,7 @@
+ * ObjectInputStream so it can all the method directly.
+ */
+ try {
+- Class[] args = {java.io.ObjectInputStream.class};
++ Class<?>[] args = {java.io.ObjectInputStream.class};
+ readObjectMethod = cl.getDeclaredMethod("readObject", args);
+ int mods = readObjectMethod.getModifiers();
+
+@@ -629,11 +630,11 @@
+ if (translation != null)
+ return translation;
+ else {
+- Class osfClass = com.sun.corba.se.impl.orbutil.ObjectStreamField.class;
++ Class<?> osfClass = com.sun.corba.se.impl.orbutil.ObjectStreamField.class;
+
+ translation = (Object[])java.lang.reflect.Array.newInstance(osfClass, objs.length);
+ Object arg[] = new Object[2];
+- Class types[] = {String.class, Class.class};
++ Class<?> types[] = {String.class, Class.class};
+ Constructor constructor = osfClass.getDeclaredConstructor(types);
+ for (int i = fields.length -1; i >= 0; i--){
+ arg[0] = fields[i].getName();
+@@ -804,7 +805,7 @@
+ }
+ }
+
+- private static long computeStructuralUID(ObjectStreamClass_1_3_1 osc, Class cl) {
++ private static long computeStructuralUID(ObjectStreamClass_1_3_1 osc, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -824,7 +825,7 @@
+ DataOutputStream data = new DataOutputStream(mdo);
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null))
+ // SerialBug 1; acc. to spec the one for
+ // java.lang.object
+@@ -910,10 +911,10 @@
+ /**
+ * Compute the JVM signature for the class.
+ */
+- static String getSignature(Class clazz) {
++ static String getSignature(Class<?> clazz) {
+ String type = null;
+ if (clazz.isArray()) {
+- Class cl = clazz;
++ Class<?> cl = clazz;
+ int dimensions = 0;
+ while (cl.isArray()) {
+ dimensions++;
+@@ -959,7 +960,7 @@
+
+ sb.append("(");
+
+- Class[] params = meth.getParameterTypes(); // avoid clone
++ Class<?>[] params = meth.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -976,7 +977,7 @@
+
+ sb.append("(");
+
+- Class[] params = cons.getParameterTypes(); // avoid clone
++ Class<?>[] params = cons.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -996,7 +997,7 @@
+ * The entries are extended from java.lang.ref.SoftReference so the
+ * gc will be able to free them if needed.
+ */
+- private static ObjectStreamClass_1_3_1 findDescriptorFor(Class cl) {
++ private static ObjectStreamClass_1_3_1 findDescriptorFor(Class<?> cl) {
+
+ int hash = cl.hashCode();
+ int index = (hash & 0x7FFFFFFF) % descriptorFor.length;
+@@ -1077,7 +1078,7 @@
+ /*
+ * Class that is a descriptor for in this virtual machine.
+ */
+- private Class ofClass;
++ private Class<?> ofClass;
+
+ /*
+ * True if descriptor for a proxy class.
+@@ -1130,22 +1131,6 @@
+ /* Get the private static final field for serial version UID */
+ // private static native long getSerialVersionUIDField(Class cl);
+
+- /* The Class Object for java.io.Serializable */
+- private static Class classSerializable = null;
+- private static Class classExternalizable = null;
+-
+- /*
+- * Resolve java.io.Serializable at load time.
+- */
+- static {
+- try {
+- classSerializable = Class.forName("java.io.Serializable");
+- classExternalizable = Class.forName("java.io.Externalizable");
+- } catch (Throwable e) {
+- System.err.println("Could not load java.io.Serializable or java.io.Externalizable.");
+- }
+- }
+-
+ /** use serialVersionUID from JDK 1.1. for interoperability */
+ private static final long serialVersionUID = -6120832682080437368L;
+
+@@ -1183,8 +1168,8 @@
+
+ private static class CompareClassByName implements Comparator {
+ public int compare(Object o1, Object o2) {
+- Class c1 = (Class)o1;
+- Class c2 = (Class)o2;
++ Class<?> c1 = (Class)o1;
++ Class<?> c2 = (Class)o2;
+ return (c1.getName()).compareTo(c2.getName());
+ }
+ }
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-09-06 11:20:49.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -905,28 +905,4 @@
return contents.toString();
@@ -531,7 +1257,7 @@
- }
}
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -43,6 +43,8 @@
import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
@@ -577,7 +1303,7 @@
// If the method passed to invoke is not from DynamicStub or its superclasses,
// it must be from an implemented interface, so we just handle
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
@@ -629,7 +1355,7 @@
public abstract org.omg.CORBA.Object makeStub() ;
}
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
@@ -665,7 +1391,7 @@
}
}
--- corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -693,7 +1419,7 @@
String msg =
--- corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -763,7 +1489,7 @@
cdrInputObject.setMessageMediator(messageMediator);
--- corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -792,7 +1518,7 @@
return s.read_Object() ;
}
--- corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -809,8 +1535,61 @@
extends
Thread
implements
+--- corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2013-09-06 11:20:51.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -170,6 +170,12 @@
+ // representing LogDomain and ExceptionGroup.
+ private Map wrapperMap ;
+
++ static class Holder {
++ static final PresentationManager defaultPresentationManager =
++ setupPresentationManager();
++ }
++ private static final Object pmLock = new Object();
++
+ private static Map staticWrapperMap = new ConcurrentHashMap();
+
+ protected MonitoringManager monitoringManager;
+@@ -235,13 +241,24 @@
+ */
+ public static PresentationManager getPresentationManager()
+ {
+- AppContext ac = AppContext.getAppContext();
+- PresentationManager pm = (PresentationManager) ac.get(PresentationManager.class);
+- if (pm == null) {
+- pm = setupPresentationManager();
+- ac.put(PresentationManager.class, pm);
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null && AppContext.getAppContexts().size() > 0) {
++ AppContext ac = AppContext.getAppContext();
++ if (ac != null) {
++ synchronized (pmLock) {
++ PresentationManager pm =
++ (PresentationManager) ac.get(PresentationManager.class);
++ if (pm == null) {
++ pm = setupPresentationManager();
++ ac.put(PresentationManager.class, pm);
++ }
++ return pm;
++ }
++ }
+ }
+- return pm;
++
++ // No security manager or AppContext
++ return Holder.defaultPresentationManager;
+ }
+
+ /** Get the appropriate StubFactoryFactory. This
--- corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2013-09-06 11:20:51.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -36,6 +36,7 @@
import com.sun.corba.se.spi.logging.CORBALogDomains ;
@@ -849,7 +1628,7 @@
+ private static final long serialVersionUID = 4571178305984833743L;
}
--- corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2013-09-06 11:20:52.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -885,7 +1664,7 @@
// Now the input stream passed to a ServiceContext
--- corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2013-09-06 11:20:53.000000000 -0700
-+++ corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-04-20 12:39:44.000000000 -0700
@@ -110,7 +110,7 @@
ParseException.badCustom=%0 (\u884C%1): forward\u5024\u5BA3\u8A00\u306Fcustom\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002\n%2\n%3
ParseException.badRepIDAlreadyAssigned=%0 (\u884C%1): \u578B%2\u306B\u306F\u3001\u524D\u306EID\u30D7\u30E9\u30B0\u30DE\u30FB\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u306E\u30EA\u30DD\u30B8\u30C8\u30EAID\u304C\u3059\u3067\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4
@@ -896,7 +1675,7 @@
ParseException.branchLabel=%0 (\u884C%1): case %2\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4
ParseException.branchName=%0 (\u884C%1): %2\u3068\u3044\u3046\u540D\u524D\u306E\u5206\u5C90\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4
--- corba/src/share/classes/javax/rmi/CORBA/Stub.java 2013-09-06 11:20:53.000000000 -0700
-+++ corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-04-20 12:39:44.000000000 -0700
@@ -61,13 +61,11 @@
private transient StubDelegate stubDelegate = null;
private static Class stubDelegateClass = null;
@@ -931,7 +1710,7 @@
try {
--- corba/src/share/classes/javax/rmi/CORBA/Util.java 2013-09-06 11:20:53.000000000 -0700
-+++ corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-04-20 12:39:44.000000000 -0700
@@ -60,14 +60,11 @@
public class Util {
@@ -970,7 +1749,7 @@
try {
--- corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2013-09-06 11:20:53.000000000 -0700
-+++ corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-04-20 12:39:44.000000000 -0700
@@ -65,17 +65,14 @@
*/
public class PortableRemoteObject {
@@ -1010,15 +1789,24 @@
try {
--- corba/src/share/classes/org/omg/CORBA/ORB.java 2013-09-06 11:20:54.000000000 -0700
-+++ corba/src/share/classes/org/omg/CORBA/ORB.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/org/omg/CORBA/ORB.java 2014-04-20 12:39:44.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -174,15 +174,6 @@
+@@ -36,6 +36,8 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+
++import sun.reflect.misc.ReflectUtil;
++
+ /**
+ * A class providing APIs for the CORBA Object Request Broker
+ * features. The <code>ORB</code> class also provides
+@@ -174,15 +176,6 @@
private static final String ORBSingletonClassKey = "org.omg.CORBA.ORBSingletonClass";
//
@@ -1034,7 +1822,7 @@
// The global instance of the singleton ORB implementation which
// acts as a factory for typecodes for generated Helper classes.
// TypeCodes should be immutable since they may be shared across
-@@ -294,10 +285,12 @@
+@@ -294,22 +287,42 @@
String className = getSystemProperty(ORBSingletonClassKey);
if (className == null)
className = getPropertyFromFile(ORBSingletonClassKey);
@@ -1046,47 +1834,97 @@
+ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
+ singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
+ } else {
-+ singleton = create_impl(className);
++ singleton = create_impl_with_systemclassloader(className);
+ }
}
return singleton;
}
-@@ -347,10 +340,13 @@
+
+- private static ORB create_impl(String className) {
++ private static ORB create_impl_with_systemclassloader(String className) {
+
++ try {
++ ReflectUtil.checkPackageAccess(className);
++ ClassLoader cl = ClassLoader.getSystemClassLoader();
++ Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
++ Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
++ return (ORB)singletonOrbClass.newInstance();
++ } catch (Throwable ex) {
++ SystemException systemException = new INITIALIZE(
++ "can't instantiate default ORB implementation " + className);
++ systemException.initCause(ex);
++ throw systemException;
++ }
++ }
++
++ private static ORB create_impl(String className) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if (cl == null)
+ cl = ClassLoader.getSystemClassLoader();
+
+ try {
+- return (ORB) Class.forName(className, true, cl).newInstance();
++ ReflectUtil.checkPackageAccess(className);
++ Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
++ Class<?> orbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
++ return (ORB)orbClass.newInstance();
+ } catch (Throwable ex) {
+ SystemException systemException = new INITIALIZE(
+ "can't instantiate default ORB implementation " + className);
+@@ -347,10 +360,12 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null)
- className = defaultORB;
+-
+- orb = create_impl(className);
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
+ orb = new com.sun.corba.se.impl.orb.ORBImpl();
+ } else {
+ orb = create_impl(className);
+ }
-
-- orb = create_impl(className);
orb.set_parameters(args, props);
return orb;
}
-@@ -375,10 +371,13 @@
+@@ -375,10 +390,12 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null)
- className = defaultORB;
+-
+- orb = create_impl(className);
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
+ orb = new com.sun.corba.se.impl.orb.ORBImpl();
+ } else {
+ orb = create_impl(className);
+ }
-
-- orb = create_impl(className);
orb.set_parameters(app, props);
return orb;
}
+@@ -574,7 +591,7 @@
+ try {
+ // First try to load the OperationDef class
+ String opDefClassName = "org.omg.CORBA.OperationDef";
+- Class opDefClass = null;
++ Class<?> opDefClass = null;
+
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if ( cl == null )
+@@ -584,7 +601,7 @@
+
+ // OK, we loaded OperationDef. Now try to get the
+ // create_operation_list(OperationDef oper) method.
+- Class[] argc = { opDefClass };
++ Class<?>[] argc = { opDefClass };
+ java.lang.reflect.Method meth =
+ this.getClass().getMethod("create_operation_list", argc);
+
--- corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2013-09-06 11:20:55.000000000 -0700
-+++ corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-04-20 12:39:44.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
@@ -1150,7 +1988,7 @@
* Unmarshalls a value type from the input stream.
* @return the value type unmarshalled from the input stream
--- corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 1969-12-31 16:00:00.000000000 -0800
-+++ corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-04-20 12:39:44.000000000 -0700
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -1306,7 +2144,7 @@
+ }
+}
--- corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-09-06 11:20:56.000000000 -0700
-+++ corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2014-04-20 12:39:44.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -1459,7 +2297,7 @@
p.pln("(" + idExtInputStream + ") "+_in+";");
p.pO();
--- hotspot/.hgtags 2013-09-06 11:21:49.000000000 -0700
-+++ hotspot/.hgtags 2014-01-18 12:16:16.000000000 -0800
++++ hotspot/.hgtags 2014-04-20 12:39:37.000000000 -0700
@@ -182,6 +182,7 @@
38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -1493,7 +2331,7 @@
e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
-@@ -550,3 +569,38 @@
+@@ -550,3 +569,60 @@
b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
@@ -1519,6 +2357,9 @@
+12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
+3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
+520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
++c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33
++0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34
++12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35
+429884602206fcf5314c8b953c06d54d337558ca jdk7u51-b00
+68f03ff066f2341b89b52a6d6e21ae09de008351 jdk7u51-b01
+67910a581eca113847c5320c49436a9816c5d5c6 jdk7u51-b02
@@ -1532,8 +2373,27 @@
+1b7aaef3df78970c9a5ef5cc353ca927241555ee jdk7u51-b10
+1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
++6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
++a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
++cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
++dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
++ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
++408028d410e316a99495c42df0031018890c22fe jdk7u55-b02
++50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03
++3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04
++b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u55-b05
++260d919d52e500a0b20f911fade2a7710474067a jdk7u55-b06
++8cf6e0a3a0651c4132ae034c2b68ddf4eb5c4d88 jdk7u55-b07
++049fd2cef85bf2d557dd7dd8a90a6831a8168ce4 jdk7u55-b08
++9b238ab164e6d1cf9cfb560827d88ef8a7d8c898 jdk7u55-b09
++573d8d080af9eff48aa3b8f0696d8874ce36fbb1 jdk7u55-b09
++36f8bd4dd467ae4183340842fd7158ac3309b826 jdk7u55-b10
++49cada8e39b9215b9fd8b9183743f92625587cfc jdk7u55-b11
++aadc864abd1ced3049bf59ce32786a07997ba190 jdk7u55-b12
++b021fd817a0177b31d1e3d65127a27458e85801e jdk7u55-b13
++d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30
--- hotspot/agent/src/os/bsd/ps_proc.c 2013-09-06 11:21:50.000000000 -0700
-+++ hotspot/agent/src/os/bsd/ps_proc.c 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/agent/src/os/bsd/ps_proc.c 2014-04-20 12:39:33.000000000 -0700
@@ -131,7 +131,7 @@
static bool ptrace_continue(pid_t pid, int signal) {
@@ -1544,7 +2404,7 @@
return false;
}
--- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-09-06 11:21:51.000000000 -0700
-+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-04-20 12:39:33.000000000 -0700
@@ -33,6 +33,7 @@
import sun.jvm.hotspot.debugger.remote.*;
import sun.jvm.hotspot.debugger.windbg.*;
@@ -1554,7 +2414,7 @@
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
--- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-09-06 11:21:52.000000000 -0700
-+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-04-20 12:39:33.000000000 -0700
@@ -35,6 +35,7 @@
import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.debugger.linux.*;
@@ -1564,7 +2424,7 @@
import sun.jvm.hotspot.livejvm.*;
import sun.jvm.hotspot.memory.*;
--- hotspot/make/bsd/Makefile 2013-09-06 11:21:59.000000000 -0700
-+++ hotspot/make/bsd/Makefile 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/Makefile 2014-04-20 12:39:31.000000000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -1594,8 +2454,27 @@
# Synonyms for win32-like targets.
compiler2: jvmg product
+--- hotspot/make/bsd/makefiles/arm.make 2013-09-06 11:21:59.000000000 -0700
++++ hotspot/make/bsd/makefiles/arm.make 2014-04-20 12:39:31.000000000 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -24,6 +24,8 @@
+
+ Obj_Files += bsd_arm.o
+
+-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
++ifneq ($(EXT_LIBS_PATH),)
++ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
++endif
+
+ CFLAGS += -DVM_LITTLE_ENDIAN
--- hotspot/make/bsd/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/buildtree.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/makefiles/buildtree.make 2014-04-20 12:39:31.000000000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -1629,8 +2508,22 @@
.dbxrc: $(BUILDTREE_MAKE)
@echo Creating $@ ...
+--- hotspot/make/bsd/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700
++++ hotspot/make/bsd/makefiles/gcc.make 2014-04-20 12:39:31.000000000 -0700
+@@ -116,7 +116,10 @@
+ CFLAGS += -fno-rtti
+ CFLAGS += -fno-exceptions
+ CFLAGS += -pthread
+-CFLAGS += -fcheck-new
++# Clang does not support -fcheck-new
++ifeq (,$(findstring clang,$(shell $(CC) -v 2>&1)))
++ CFLAGS += -fcheck-new
++endif
+ # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+ # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
--- hotspot/make/bsd/makefiles/jsig.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/jsig.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/makefiles/jsig.make 2014-04-20 12:39:31.000000000 -0700
@@ -36,9 +36,16 @@
LIBJSIG_G = lib$(JSIG_G).so
endif
@@ -1684,7 +2577,7 @@
.PHONY: install_jsig
--- hotspot/make/bsd/makefiles/launcher.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/launcher.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/makefiles/launcher.make 2014-04-20 12:39:31.000000000 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -1695,7 +2588,7 @@
# The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
# freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting
--- hotspot/make/bsd/makefiles/mapfile-vers-product 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/mapfile-vers-product 2014-01-18 23:49:25.000000000 -0800
++++ hotspot/make/bsd/makefiles/mapfile-vers-product 2014-04-20 12:39:31.000000000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -2175,7 +3068,7 @@
+};
--- hotspot/make/bsd/makefiles/ppc.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/ppc.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/makefiles/ppc.make 2014-04-20 12:39:31.000000000 -0700
@@ -28,3 +28,6 @@
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
@@ -2184,7 +3077,7 @@
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
--- hotspot/make/bsd/makefiles/saproc.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/bsd/makefiles/saproc.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/bsd/makefiles/saproc.make 2014-04-20 12:39:31.000000000 -0700
@@ -36,6 +36,11 @@
LIBSAPROC_G = lib$(SAPROC_G).so
endif
@@ -2242,20 +3135,50 @@
fi
--- hotspot/make/hotspot_version 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/hotspot_version 2014-01-18 12:16:13.000000000 -0800
-@@ -34,8 +34,8 @@
- HOTSPOT_VM_COPYRIGHT=Copyright 2013
++++ hotspot/make/hotspot_version 2014-04-20 12:39:32.000000000 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -31,11 +31,11 @@
+ #
+
+ # Don't put quotes (fail windows build).
+-HOTSPOT_VM_COPYRIGHT=Copyright 2013
++HOTSPOT_VM_COPYRIGHT=Copyright 2014
HS_MAJOR_VER=24
-HS_MINOR_VER=0
-HS_BUILD_NUMBER=56
-+HS_MINOR_VER=51
++HS_MINOR_VER=55
+HS_BUILD_NUMBER=03
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
+--- hotspot/make/linux/makefiles/arm.make 2013-09-06 11:22:00.000000000 -0700
++++ hotspot/make/linux/makefiles/arm.make 2014-04-20 12:39:31.000000000 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -24,6 +24,8 @@
+
+ Obj_Files += linux_arm.o
+
+-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
++ifneq ($(EXT_LIBS_PATH),)
++ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
++endif
+
+ CFLAGS += -DVM_LITTLE_ENDIAN
--- hotspot/make/solaris/makefiles/defs.make 2013-09-06 11:22:00.000000000 -0700
-+++ hotspot/make/solaris/makefiles/defs.make 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/make/solaris/makefiles/defs.make 2014-04-20 12:39:31.000000000 -0700
@@ -221,8 +221,8 @@
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -2268,7 +3191,7 @@
ifeq ($(ARCH_DATA_MODEL),32)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
--- hotspot/make/windows/makefiles/compile.make 2013-09-06 11:22:01.000000000 -0700
-+++ hotspot/make/windows/makefiles/compile.make 2013-12-01 11:14:01.000000000 -0800
++++ hotspot/make/windows/makefiles/compile.make 2014-04-20 12:39:32.000000000 -0700
@@ -172,6 +172,7 @@
PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy-
@@ -2308,7 +3231,7 @@
# If NO_OPTIMIZATIONS is defined in the environment, turn everything off
--- hotspot/make/windows/makefiles/sa.make 2013-09-06 11:22:01.000000000 -0700
-+++ hotspot/make/windows/makefiles/sa.make 2013-12-01 11:14:01.000000000 -0800
++++ hotspot/make/windows/makefiles/sa.make 2014-04-20 12:39:32.000000000 -0700
@@ -107,6 +107,9 @@
!if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
SA_LFLAGS = $(SA_LFLAGS) -map -debug
@@ -2320,7 +3243,7 @@
# Note that we do not keep sawindbj.obj around as it would then
# get included in the dumpbin command in build_vm_def.sh
--- hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-09-06 11:22:02.000000000 -0700
-+++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-04-20 12:39:31.000000000 -0700
@@ -71,7 +71,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -2334,7 +3257,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -460,14 +460,14 @@
void AttachListener::vm_start() {
@@ -2353,7 +3276,7 @@
ret = ::unlink(fn);
if (ret == -1) {
--- hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -2402,7 +3325,7 @@
+}
+
--- hotspot/src/os/bsd/vm/os_bsd.cpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -187,6 +187,8 @@
static int SR_signum = SIGUSR2;
sigset_t SR_sigset;
@@ -2624,7 +3547,7 @@
struct sched_param sp;
int policy;
--- hotspot/src/os/bsd/vm/os_bsd.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/bsd/vm/os_bsd.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/os_bsd.hpp 2014-04-20 12:39:29.000000000 -0700
@@ -103,6 +103,12 @@
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -2639,7 +3562,7 @@
static void init_thread_fpu_state();
--- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2014-04-20 12:39:29.000000000 -0700
@@ -31,10 +31,22 @@
# include "atomic_bsd_x86.inline.hpp"
# include "orderAccess_bsd_x86.inline.hpp"
@@ -2664,7 +3587,7 @@
// System includes
--- hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2014-04-20 12:39:29.000000000 -0700
@@ -34,11 +34,26 @@
# include "orderAccess_bsd_x86.inline.hpp"
# include "prefetch_bsd_x86.inline.hpp"
@@ -2693,7 +3616,7 @@
// Contains inlined functions for class Thread and ThreadLocalStorage
--- hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/linux/vm/os_linux.cpp 2014-01-18 12:16:16.000000000 -0800
++++ hotspot/src/os/linux/vm/os_linux.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -2696,6 +2696,14 @@
alignment_hint, exec, strerror(err), err);
}
@@ -2730,7 +3653,7 @@
}
// Fall through and try to use small pages
--- hotspot/src/os/linux/vm/os_linux.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ hotspot/src/os/linux/vm/os_linux.hpp 2014-01-18 12:16:13.000000000 -0800
++++ hotspot/src/os/linux/vm/os_linux.hpp 2014-04-20 12:39:29.000000000 -0700
@@ -100,6 +100,7 @@
public:
@@ -2740,7 +3663,7 @@
static void *dll_load_in_vmthread(const char *name, char *ebuf, int ebuflen);
--- hotspot/src/os/posix/vm/os_posix.cpp 2013-09-06 11:22:04.000000000 -0700
-+++ hotspot/src/os/posix/vm/os_posix.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os/posix/vm/os_posix.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -173,11 +173,19 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -2761,8 +3684,150 @@
}
void os::Posix::print_uname_info(outputStream* st) {
+--- hotspot/src/os/windows/vm/os_windows.cpp 2013-09-06 11:22:04.000000000 -0700
++++ hotspot/src/os/windows/vm/os_windows.cpp 2014-04-20 12:39:29.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -1591,6 +1591,7 @@
+
+ void os::win32::print_windows_version(outputStream* st) {
+ OSVERSIONINFOEX osvi;
++ SYSTEM_INFO si;
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+@@ -1600,6 +1601,18 @@
+ }
+
+ int os_vers = osvi.dwMajorVersion * 1000 + osvi.dwMinorVersion;
++
++ ZeroMemory(&si, sizeof(SYSTEM_INFO));
++ if (os_vers >= 5002) {
++ // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
++ // find out whether we are running on 64 bit processor or not.
++ if (os::Kernel32Dll::GetNativeSystemInfoAvailable()) {
++ os::Kernel32Dll::GetNativeSystemInfo(&si);
++ } else {
++ GetSystemInfo(&si);
++ }
++ }
++
+ if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ switch (os_vers) {
+ case 3051: st->print(" Windows NT 3.51"); break;
+@@ -1607,57 +1620,48 @@
+ case 5000: st->print(" Windows 2000"); break;
+ case 5001: st->print(" Windows XP"); break;
+ case 5002:
++ if (osvi.wProductType == VER_NT_WORKSTATION &&
++ si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
++ st->print(" Windows XP x64 Edition");
++ } else {
++ st->print(" Windows Server 2003 family");
++ }
++ break;
++
+ case 6000:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows Vista");
++ } else {
++ st->print(" Windows Server 2008");
++ }
++ break;
++
+ case 6001:
+- case 6002: {
+- // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
+- // find out whether we are running on 64 bit processor or not.
+- SYSTEM_INFO si;
+- ZeroMemory(&si, sizeof(SYSTEM_INFO));
+- if (!os::Kernel32Dll::GetNativeSystemInfoAvailable()){
+- GetSystemInfo(&si);
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows 7");
+ } else {
+- os::Kernel32Dll::GetNativeSystemInfo(&si);
++ st->print(" Windows Server 2008 R2");
+ }
+- if (os_vers == 5002) {
+- if (osvi.wProductType == VER_NT_WORKSTATION &&
+- si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+- st->print(" Windows XP x64 Edition");
+- else
+- st->print(" Windows Server 2003 family");
+- } else if (os_vers == 6000) {
+- if (osvi.wProductType == VER_NT_WORKSTATION)
+- st->print(" Windows Vista");
+- else
+- st->print(" Windows Server 2008");
+- if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+- st->print(" , 64 bit");
+- } else if (os_vers == 6001) {
+- if (osvi.wProductType == VER_NT_WORKSTATION) {
+- st->print(" Windows 7");
+- } else {
+- // Unrecognized windows, print out its major and minor versions
+- st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+- }
+- if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+- st->print(" , 64 bit");
+- } else if (os_vers == 6002) {
+- if (osvi.wProductType == VER_NT_WORKSTATION) {
+- st->print(" Windows 8");
+- } else {
+- st->print(" Windows Server 2012");
+- }
+- if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+- st->print(" , 64 bit");
+- } else { // future os
+- // Unrecognized windows, print out its major and minor versions
+- st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+- if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+- st->print(" , 64 bit");
++ break;
++
++ case 6002:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows 8");
++ } else {
++ st->print(" Windows Server 2012");
+ }
+ break;
+- }
+- default: // future windows, print out its major and minor versions
++
++ case 6003:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows 8.1");
++ } else {
++ st->print(" Windows Server 2012 R2");
++ }
++ break;
++
++ default: // future os
++ // Unrecognized windows, print out its major and minor versions
+ st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+ }
+ } else {
+@@ -1669,6 +1673,11 @@
+ st->print(" Windows %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+ }
+ }
++
++ if (os_vers >= 6000 && si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
++ st->print(" , 64 bit");
++ }
++
+ st->print(" Build %d", osvi.dwBuildNumber);
+ st->print(" %s", osvi.szCSDVersion); // service pack
+ st->cr();
--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-09-06 11:22:04.000000000 -0700
-+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2014-04-20 12:39:31.000000000 -0700
@@ -24,7 +24,7 @@
*/
@@ -2773,7 +3838,14 @@
#endif
--- hotspot/src/share/vm/classfile/classFileParser.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ hotspot/src/share/vm/classfile/classFileParser.cpp 2013-12-01 11:14:01.000000000 -0800
++++ hotspot/src/share/vm/classfile/classFileParser.cpp 2014-04-20 12:39:30.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -2028,8 +2028,8 @@
}
if (lvt_cnt == max_lvt_cnt) {
@@ -2796,7 +3868,19 @@
}
localvariable_type_table_start[lvtt_cnt] =
parse_localvariable_table(code_length,
-@@ -4051,9 +4051,8 @@
+@@ -2661,6 +2661,11 @@
+ "Short length on BootstrapMethods in class file %s",
+ CHECK);
+
++ guarantee_property(attribute_byte_length > sizeof(u2),
++ "Invalid BootstrapMethods attribute length %u in class file %s",
++ attribute_byte_length,
++ CHECK);
++
+ // The attribute contains a counted array of counted tuples of shorts,
+ // represending bootstrap specifiers:
+ // length*{bootstrap_method_index, argument_count*{argument_index}}
+@@ -4051,9 +4056,8 @@
for (int index = 0; index < num_methods; index++) {
methodOop m = (methodOop)methods->obj_at(index);
@@ -2809,7 +3893,7 @@
Symbol* name = m->name();
--- hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -109,7 +109,7 @@
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
@@ -2819,8 +3903,122 @@
e.commit();
}
}
+--- hotspot/src/share/vm/oops/objArrayKlass.cpp 2013-09-06 11:22:13.000000000 -0700
++++ hotspot/src/share/vm/oops/objArrayKlass.cpp 2014-04-20 12:39:30.000000000 -0700
+@@ -149,7 +149,7 @@
+ if (element_is_null ||
+ Klass::cast((new_val->klass()))->is_subtype_of(bound)) {
+ bs->write_ref_field_pre(p, new_val);
+- *p = *from;
++ *p = element;
+ } else {
+ // We must do a barrier to cover the partial copy.
+ const size_t pd = pointer_delta(p, dst, (size_t)heapOopSize);
+--- hotspot/src/share/vm/opto/matcher.cpp 2013-09-06 11:22:14.000000000 -0700
++++ hotspot/src/share/vm/opto/matcher.cpp 2014-04-20 12:39:30.000000000 -0700
+@@ -464,17 +464,17 @@
+ C->FIRST_STACK_mask().Clear();
+
+ // Add in the incoming argument area
+- OptoReg::Name init = OptoReg::add(_old_SP, C->out_preserve_stack_slots());
+- for (i = init; i < _in_arg_limit; i = OptoReg::add(i,1))
++ OptoReg::Name init_in = OptoReg::add(_old_SP, C->out_preserve_stack_slots());
++ for (i = init_in; i < _in_arg_limit; i = OptoReg::add(i,1)) {
+ C->FIRST_STACK_mask().Insert(i);
+-
++ }
+ // Add in all bits past the outgoing argument area
+ guarantee(RegMask::can_represent_arg(OptoReg::add(_out_arg_limit,-1)),
+ "must be able to represent all call arguments in reg mask");
+- init = _out_arg_limit;
+- for (i = init; RegMask::can_represent(i); i = OptoReg::add(i,1))
++ OptoReg::Name init = _out_arg_limit;
++ for (i = init; RegMask::can_represent(i); i = OptoReg::add(i,1)) {
+ C->FIRST_STACK_mask().Insert(i);
+-
++ }
+ // Finally, set the "infinite stack" bit.
+ C->FIRST_STACK_mask().set_AllStack();
+
+@@ -506,16 +506,36 @@
+ idealreg2spillmask[Op_VecS]->OR(C->FIRST_STACK_mask());
+ }
+ if (Matcher::vector_size_supported(T_FLOAT,2)) {
++ // For VecD we need dual alignment and 8 bytes (2 slots) for spills.
++ // RA guarantees such alignment since it is needed for Double and Long values.
+ *idealreg2spillmask[Op_VecD] = *idealreg2regmask[Op_VecD];
+ idealreg2spillmask[Op_VecD]->OR(aligned_stack_mask);
+ }
+ if (Matcher::vector_size_supported(T_FLOAT,4)) {
++ // For VecX we need quadro alignment and 16 bytes (4 slots) for spills.
++ //
++ // RA can use input arguments stack slots for spills but until RA
++ // we don't know frame size and offset of input arg stack slots.
++ //
++ // Exclude last input arg stack slots to avoid spilling vectors there
++ // otherwise vector spills could stomp over stack slots in caller frame.
++ OptoReg::Name in = OptoReg::add(_in_arg_limit, -1);
++ for (int k = 1; (in >= init_in) && (k < RegMask::SlotsPerVecX); k++) {
++ aligned_stack_mask.Remove(in);
++ in = OptoReg::add(in, -1);
++ }
+ aligned_stack_mask.clear_to_sets(RegMask::SlotsPerVecX);
+ assert(aligned_stack_mask.is_AllStack(), "should be infinite stack");
+ *idealreg2spillmask[Op_VecX] = *idealreg2regmask[Op_VecX];
+ idealreg2spillmask[Op_VecX]->OR(aligned_stack_mask);
+ }
+ if (Matcher::vector_size_supported(T_FLOAT,8)) {
++ // For VecY we need octo alignment and 32 bytes (8 slots) for spills.
++ OptoReg::Name in = OptoReg::add(_in_arg_limit, -1);
++ for (int k = 1; (in >= init_in) && (k < RegMask::SlotsPerVecY); k++) {
++ aligned_stack_mask.Remove(in);
++ in = OptoReg::add(in, -1);
++ }
+ aligned_stack_mask.clear_to_sets(RegMask::SlotsPerVecY);
+ assert(aligned_stack_mask.is_AllStack(), "should be infinite stack");
+ *idealreg2spillmask[Op_VecY] = *idealreg2regmask[Op_VecY];
+--- hotspot/src/share/vm/opto/output.cpp 2013-09-06 11:22:14.000000000 -0700
++++ hotspot/src/share/vm/opto/output.cpp 2014-04-20 12:39:30.000000000 -0700
+@@ -345,6 +345,11 @@
+ uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks);
+ uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks);
+ int* jmp_nidx = NEW_RESOURCE_ARRAY(int ,nblocks);
++
++ // Collect worst case block paddings
++ int* block_worst_case_pad = NEW_RESOURCE_ARRAY(int, nblocks);
++ memset(block_worst_case_pad, 0, nblocks * sizeof(int));
++
+ DEBUG_ONLY( uint *jmp_target = NEW_RESOURCE_ARRAY(uint,nblocks); )
+ DEBUG_ONLY( uint *jmp_rule = NEW_RESOURCE_ARRAY(uint,nblocks); )
+
+@@ -461,6 +466,7 @@
+ last_avoid_back_to_back_adr += max_loop_pad;
+ }
+ blk_size += max_loop_pad;
++ block_worst_case_pad[i + 1] = max_loop_pad;
+ }
+ }
+
+@@ -500,9 +506,16 @@
+ if (bnum > i) { // adjust following block's offset
+ offset -= adjust_block_start;
+ }
++
++ // This block can be a loop header, account for the padding
++ // in the previous block.
++ int block_padding = block_worst_case_pad[i];
++ assert(i == 0 || block_padding == 0 || br_offs >= block_padding, "Should have at least a padding on top");
+ // In the following code a nop could be inserted before
+ // the branch which will increase the backward distance.
+- bool needs_padding = ((uint)br_offs == last_may_be_short_branch_adr);
++ bool needs_padding = ((uint)(br_offs - block_padding) == last_may_be_short_branch_adr);
++ assert(!needs_padding || jmp_offset[i] == 0, "padding only branches at the beginning of block");
++
+ if (needs_padding && offset <= 0)
+ offset -= nop_size;
+
--- hotspot/src/share/vm/prims/methodHandles.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/prims/methodHandles.cpp 2014-01-18 12:16:13.000000000 -0800
++++ hotspot/src/share/vm/prims/methodHandles.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -175,30 +175,32 @@
}
@@ -3004,7 +4202,7 @@
int flags = java_lang_invoke_MemberName::flags(mname());
int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
--- hotspot/src/share/vm/prims/methodHandles.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/prims/methodHandles.hpp 2014-01-18 12:16:13.000000000 -0800
++++ hotspot/src/share/vm/prims/methodHandles.hpp 2014-04-20 12:39:30.000000000 -0700
@@ -51,12 +51,12 @@
public:
@@ -3021,7 +4219,7 @@
AccessFlags mods, oop type, oop name,
intptr_t offset, bool is_setter = false);
--- hotspot/src/share/vm/runtime/atomic.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/atomic.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/atomic.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -54,6 +54,12 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "atomic_windows_x86.inline.hpp"
@@ -3036,7 +4234,7 @@
# include "atomic_linux_arm.inline.hpp"
#endif
--- hotspot/src/share/vm/runtime/mutexLocker.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/mutexLocker.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/mutexLocker.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -133,13 +133,15 @@
Mutex* Management_lock = NULL;
@@ -3085,7 +4283,7 @@
GCMutexLocker::GCMutexLocker(Monitor * mutex) {
--- hotspot/src/share/vm/runtime/mutexLocker.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/mutexLocker.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/mutexLocker.hpp 2014-04-20 12:39:30.000000000 -0700
@@ -135,13 +135,15 @@
extern Mutex* Management_lock; // a lock used to serialize JVM management
@@ -3106,7 +4304,7 @@
// A MutexLocker provides mutual exclusion with respect to a given mutex
// for the scope which contains the locker. The lock is an OS lock, not
--- hotspot/src/share/vm/runtime/objectMonitor.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/objectMonitor.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/objectMonitor.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -1684,7 +1684,7 @@
}
iterator->_notified = 1 ;
@@ -3126,7 +4324,7 @@
iterator->TState = ObjectWaiter::TS_ENTER ;
}
--- hotspot/src/share/vm/runtime/os.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/os.cpp 2014-01-18 12:16:16.000000000 -0800
++++ hotspot/src/share/vm/runtime/os.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -1139,9 +1139,6 @@
"%/lib/jce.jar:"
"%/lib/charsets.jar:"
@@ -3138,7 +4336,7 @@
char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
if (sysclasspath == NULL) return false;
--- hotspot/src/share/vm/runtime/os.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/os.hpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/os.hpp 2014-04-20 12:39:30.000000000 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -3160,7 +4358,7 @@
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
--- hotspot/src/share/vm/runtime/reflection.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ hotspot/src/share/vm/runtime/reflection.cpp 2014-01-18 12:16:14.000000000 -0800
++++ hotspot/src/share/vm/runtime/reflection.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -460,7 +460,7 @@
// doesn't have a classloader.
if ((current_class == NULL) ||
@@ -3171,7 +4369,7 @@
return true;
}
--- hotspot/src/share/vm/runtime/vmThread.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ hotspot/src/share/vm/runtime/vmThread.cpp 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/runtime/vmThread.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -390,7 +390,7 @@
// Only write caller thread information for non-concurrent vm operations.
// For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -3182,7 +4380,7 @@
}
--- hotspot/src/share/vm/services/gcNotifier.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ hotspot/src/share/vm/services/gcNotifier.cpp 2014-01-18 12:16:14.000000000 -0800
++++ hotspot/src/share/vm/services/gcNotifier.cpp 2014-04-20 12:39:29.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3207,7 +4405,7 @@
klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
instanceKlassHandle gc_mbean_klass(THREAD, k);
--- hotspot/src/share/vm/trace/tracetypes.xml 2013-09-06 11:22:17.000000000 -0700
-+++ hotspot/src/share/vm/trace/tracetypes.xml 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/src/share/vm/trace/tracetypes.xml 2014-04-20 12:39:30.000000000 -0700
@@ -60,7 +60,7 @@
<types>
<content_types>
@@ -3229,7 +4427,7 @@
<!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
<primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
--- hotspot/src/share/vm/utilities/vmError.cpp 2013-09-06 11:22:17.000000000 -0700
-+++ hotspot/src/share/vm/utilities/vmError.cpp 2014-01-18 12:16:16.000000000 -0800
++++ hotspot/src/share/vm/utilities/vmError.cpp 2014-04-20 12:39:30.000000000 -0700
@@ -698,6 +698,18 @@
st->cr();
}
@@ -3250,7 +4448,7 @@
if (_verbose && Universe::is_fully_initialized()) {
--- hotspot/test/compiler/5091921/Test7005594.sh 2013-09-06 11:22:17.000000000 -0700
-+++ hotspot/test/compiler/5091921/Test7005594.sh 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/test/compiler/5091921/Test7005594.sh 2014-04-20 12:39:32.000000000 -0700
@@ -60,6 +60,9 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -3262,7 +4460,7 @@
echo "Unable to determine amount of physical memory on the machine"
fi
--- hotspot/test/runtime/7110720/Test7110720.sh 2013-09-06 11:22:20.000000000 -0700
-+++ hotspot/test/runtime/7110720/Test7110720.sh 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/test/runtime/7110720/Test7110720.sh 2014-04-20 12:39:32.000000000 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -3273,7 +4471,7 @@
RM=/bin/rm
CP=/bin/cp
--- hotspot/test/runtime/7158800/Test7158800.sh 1969-12-31 16:00:00.000000000 -0800
-+++ hotspot/test/runtime/7158800/Test7158800.sh 2014-01-18 12:16:15.000000000 -0800
++++ hotspot/test/runtime/7158800/Test7158800.sh 2014-04-20 12:39:32.000000000 -0700
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
@@ -3367,7 +4565,7 @@
+ exit 0
+fi
--- jaxp/.hgtags 2013-09-06 11:22:52.000000000 -0700
-+++ jaxp/.hgtags 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/.hgtags 2014-04-20 12:39:50.000000000 -0700
@@ -123,6 +123,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -3399,7 +4597,7 @@
5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12
83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13
68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14
-@@ -343,3 +360,38 @@
+@@ -343,3 +360,60 @@
66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
@@ -3425,6 +4623,9 @@
+4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
+a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
+3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
++056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33
++b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34
++7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35
+0a8b95184728548be4b20876e05f76e0262e4195 jdk7u51-b00
+2450ace952f45202e5a3fd4f6a8356a196fe029e jdk7u51-b01
+68def851cc6b17944756f1986734b323d8569571 jdk7u51-b02
@@ -3438,8 +4639,27 @@
+65798d05674dc9453c5935c018d012b11c8697f8 jdk7u51-b10
+70b5691c44d2830efd4301856e6223fa43894462 jdk7u51-b11
+807946db29f42477e8d8390be01c7e27280bc85c jdk7u51-b12
++114654a331e2f97a048d7ed43d06d7512e20e2c1 jdk7u51-b13
++3161567adae93d12c64b79592bda3046f0c0a22d jdk7u51-b30
++e85ee81daec2ea2fa21bf804d03431b0664c6dff jdk7u51-b31
++807946db29f42477e8d8390be01c7e27280bc85c jdk7u55-b00
++bb7779a8fc4d14719e907b8890a2665476cf45ae jdk7u55-b01
++8275dc4db7f852edb331ae48d663d08b9ab2b5c7 jdk7u55-b02
++381e73f93a83e8d3bfd7dbf79f4f363a8fd6442f jdk7u55-b03
++c72c57f71c2ba6362d9ccfbf4743947b9ecefcac jdk7u55-b04
++5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u55-b05
++c59d714090080ad2e06f0ca5e8d354403059d8ce jdk7u55-b06
++125ea54089add3a16898b801a9989bf6cca05da6 jdk7u55-b07
++39337c00cb3ce29b4d67f6d247c3fa80f16cb49f jdk7u55-b08
++537f4f609132f3d6a4ce506c98f1dbd57f1320f8 jdk7u55-b09
++997bdd44d5de4aee319ff0a0d2892a912d9de6f5 jdk7u55-b09
++606483a43e8b6317d84922b9ed2b2c30d9e77419 jdk7u55-b10
++f3f02e67d867ae25cd4f3b9bc39a4fd17f593126 jdk7u55-b11
++708a1872f5bb8ba58ecc9fcbf4e12e6fa4783998 jdk7u55-b12
++14719f73596f5c90e3f46c0f4312f32e5b105edd jdk7u55-b13
++01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30
--- jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2014-04-20 12:39:46.000000000 -0700
@@ -39,33 +39,138 @@
//
// Constants
@@ -3593,7 +4813,7 @@
public static final String ACCESS_EXTERNAL_ALL = "all";
--- jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2014-04-20 12:39:46.000000000 -0700
@@ -52,6 +52,8 @@
*/
public class ExsltStrings extends ExsltBase
@@ -3677,7 +4897,7 @@
-
}
--- jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2014-04-20 12:39:46.000000000 -0700
@@ -56,6 +56,7 @@
*/
public class Extensions
@@ -3787,8 +5007,75 @@
}
}
}
+--- jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java 2013-09-06 11:22:55.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java 2014-04-20 12:39:46.000000000 -0700
+@@ -54,8 +54,8 @@
+ //
+ // Constants
+ //
+- private static final String XALAN_INTERNAL = "com.sun.org.apache.xalan.internal";
+- private static final String XERCES_INTERNAL = "com.sun.org.apache.xerces.internal";
++ private static final String JAXP_INTERNAL = "com.sun.org.apache";
++ private static final String STAX_INTERNAL = "com.sun.xml.internal";
+
+ // name of default properties file to look for in JDK's jre/lib directory
+ private static final String DEFAULT_PROPERTIES_FILENAME =
+@@ -497,12 +497,8 @@
+ public static Class findProviderClass(String className, boolean doFallback)
+ throws ClassNotFoundException, ConfigurationError
+ {
+- if (System.getSecurityManager()!=null) {
+- return Class.forName(className);
+- } else {
+- return findProviderClass (className,
++ return findProviderClass (className,
+ findClassLoader (), doFallback);
+- }
+ }
+
+ /**
+@@ -517,8 +513,8 @@
+ SecurityManager security = System.getSecurityManager();
+ try{
+ if (security != null){
+- if (className.startsWith(XALAN_INTERNAL) ||
+- className.startsWith(XERCES_INTERNAL)) {
++ if (className.startsWith(JAXP_INTERNAL) ||
++ className.startsWith(STAX_INTERNAL)) {
+ cl = null;
+ } else {
+ final int lastDot = className.lastIndexOf(".");
+@@ -533,16 +529,7 @@
+
+ Class providerClass;
+ if (cl == null) {
+- // XXX Use the bootstrap ClassLoader. There is no way to
+- // load a class using the bootstrap ClassLoader that works
+- // in both JDK 1.1 and Java 2. However, this should still
+- // work b/c the following should be true:
+- //
+- // (cl == null) iff current ClassLoader == null
+- //
+- // Thus Class.forName(String) will use the current
+- // ClassLoader which will be the bootstrap ClassLoader.
+- providerClass = Class.forName(className);
++ providerClass = Class.forName(className, false, ObjectFactory.class.getClassLoader());
+ } else {
+ try {
+ providerClass = cl.loadClass(className);
+--- jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java 2013-09-06 11:22:55.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java 2014-04-20 12:39:46.000000000 -0700
+@@ -57,7 +57,7 @@
+ return securitySupport;
+ }
+
+- static ClassLoader getContextClassLoader() {
++ public static ClassLoader getContextClassLoader() {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ ClassLoader cl = null;
--- jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -0,0 +1,449 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -4240,7 +5527,7 @@
+ }
+}
--- jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -94,6 +94,23 @@
}
@@ -4289,7 +5576,7 @@
* Return the value of the specified property
*
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2014-04-20 12:39:46.000000000 -0700
@@ -86,7 +86,7 @@
if (input == null) {
docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
@@ -4300,7 +5587,7 @@
if (accessError != null) {
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2014-04-20 12:39:46.000000000 -0700
@@ -87,7 +87,7 @@
if (input == null) {
docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
@@ -4311,7 +5598,7 @@
if (accessError != null) {
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2013-09-06 11:22:55.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2014-04-20 12:39:46.000000000 -0700
@@ -28,6 +28,7 @@
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
@@ -4351,7 +5638,7 @@
if (accessError != null) {
ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2013-09-06 11:22:56.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2014-04-20 12:39:46.000000000 -0700
@@ -44,11 +44,11 @@
import com.sun.org.apache.bcel.internal.classfile.JavaClass;
import com.sun.org.apache.xalan.internal.XalanConstants;
@@ -4406,7 +5693,7 @@
}
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -29,7 +29,7 @@
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
@@ -4426,7 +5713,7 @@
if ("true".equals(tfactory.getAttribute(TransformerFactoryImpl.ENABLE_INLINING)))
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -77,6 +77,7 @@
import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
@@ -4525,7 +5812,7 @@
// Set a document loader (for xsl:include/import) if defined
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -25,6 +25,7 @@
import com.sun.org.apache.xalan.internal.XalanConstants;
@@ -4563,7 +5850,7 @@
/**
* Return the state of the services mechanism feature.
--- jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2014-04-20 12:39:46.000000000 -0700
@@ -23,6 +23,7 @@
package com.sun.org.apache.xalan.internal.xsltc.trax;
@@ -4618,7 +5905,7 @@
}catch (SAXNotRecognizedException snre ) {
throw new TransformerConfigurationException
--- jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -33,6 +33,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
@@ -4663,7 +5950,7 @@
new XMLSecurityPropertyManager());
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2014-04-20 12:39:47.000000000 -0700
@@ -174,8 +174,6 @@
/** JAXP schemaSource language: when used internally may include DTD namespace (DOM) */
public static final String SCHEMA_LANGUAGE = "schemaLanguage";
@@ -4801,7 +6088,7 @@
/**
* {@link org.w3c.dom.TypeInfo} associated with current element/attribute
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2014-04-20 12:39:47.000000000 -0700
@@ -25,6 +25,7 @@
package com.sun.org.apache.xerces.internal.impl;
@@ -4894,7 +6181,7 @@
if(equivalentProperty != null){
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2014-04-20 12:39:47.000000000 -0700
@@ -108,6 +108,7 @@
* @author Elena Litani, IBM
* @author Michael Glavassevich, IBM
@@ -4914,7 +6201,7 @@
"ElementAttributeLimit",
new Object[]{rawname, new Integer(fElementAttributeLimit) },
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2014-04-20 12:39:47.000000000 -0700
@@ -44,6 +44,9 @@
import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
@@ -5058,7 +6345,7 @@
public DTDGrammar getGrammar(){
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2014-04-20 12:39:47.000000000 -0700
@@ -50,12 +50,14 @@
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.impl.Constants;
@@ -5327,7 +6614,7 @@
//
// Protected methods
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2014-04-20 12:39:47.000000000 -0700
@@ -1090,6 +1090,8 @@
((XMLDTDScannerImpl)fDTDScanner).reset(fPropertyManager);
@@ -5338,7 +6625,7 @@
again = false;
switch (fScannerState) {
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2014-04-20 12:39:47.000000000 -0700
@@ -18,19 +18,17 @@
* limitations under the License.
*/
@@ -5498,7 +6785,7 @@
/**
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2014-04-20 12:39:47.000000000 -0700
@@ -58,6 +58,7 @@
* @author Neeraj Bajaj, Sun Microsystems
* @author Venugopal Rao K, Sun Microsystems
@@ -5522,7 +6809,7 @@
}
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2013-09-06 11:22:57.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2014-04-20 12:39:47.000000000 -0700
@@ -32,6 +32,8 @@
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl;
@@ -5649,7 +6936,7 @@
* <p>
* <pre>
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2013-09-06 11:22:58.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2014-04-20 12:39:47.000000000 -0700
@@ -44,6 +44,7 @@
# 2.9 Standalone Document Declaration
@@ -5674,7 +6961,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the application.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6142,7 +7429,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Element \"{0}\" hat mehr als \"{1}\" Attribute. \"{1}\" ist der durch die Anwendung vorgeschriebene Grenzwert.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6611,7 +7898,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= El elemento \"{0}\" tiene m\u00E1s de \"{1}\" atributos, \"{1}\" es el l\u00EDmite impuesto por la aplicaci\u00F3n.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -7081,7 +8368,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= L''\u00E9l\u00E9ment \"{0}\" a plus de \"{1}\" attributs. \"{1}\" est la limite impos\u00E9e par l''application.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -7550,7 +8837,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= L''elemento \"{0}\" contiene pi\u00F9 di \"{1}\" attributi. \"{1}\" \u00E8 il limite imposto dall''applicazione.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,26 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -8019,7 +9306,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u8981\u7D20\"{0}\"\u306B\"{1}\"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\"{1}\"\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -8488,7 +9775,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \"{0}\" \uC694\uC18C\uC5D0 \"{1}\"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. \"{1}\"\uC740(\uB294) \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -8964,7 +10251,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= O elemento \"{0}\" tem mais de \"{1}\" atributos. \"{1}\" \u00E9 o limite imposto pela aplica\u00E7\u00E3o.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -9434,7 +10721,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Elementet \"{0}\" har fler \u00E4n \"{1}\" attribut, \"{1}\" \u00E4r applikationens gr\u00E4nsv\u00E4rde.
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,26 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -9909,7 +11196,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u5143\u7D20 \"{0}\" \u5177\u6709\u591A\u4E2A \"{1}\" \u5C5E\u6027, \"{1}\" \u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2014-04-20 12:39:47.000000000 -0700
@@ -1,30 +1,27 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -10400,7 +11687,7 @@
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u5143\u7D20 \"{0}\" \u5177\u6709\u8D85\u904E \"{1}\" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C\"{1}\" \u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2014-04-20 12:39:47.000000000 -0700
@@ -21,13 +21,13 @@
package com.sun.org.apache.xerces.internal.impl.xs.models;
@@ -10464,7 +11751,7 @@
}
if (suffixLength == Constants.ERROR_REPORTER_PROPERTY.length() &&
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2014-04-20 12:39:47.000000000 -0700
@@ -40,6 +40,7 @@
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.util.XMLChar;
@@ -10485,7 +11772,7 @@
// reset max values in case processing continues on error
--- jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2013-09-06 11:22:59.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2014-04-20 12:39:47.000000000 -0700
@@ -70,7 +70,6 @@
import com.sun.org.apache.xerces.internal.util.DefaultErrorHandler;
import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
@@ -10540,7 +11827,7 @@
//set entity resolver
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -36,7 +36,7 @@
import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer;
@@ -10652,7 +11939,7 @@
}
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -34,8 +34,8 @@
import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer;
@@ -10839,7 +12126,7 @@
return super.getProperty(name);
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2014-04-20 12:39:46.000000000 -0700
@@ -26,6 +26,7 @@
package com.sun.org.apache.xerces.internal.jaxp.validation;
@@ -10869,7 +12156,7 @@
identityTransformer2 = tf.newTransformerHandler();
} catch (TransformerConfigurationException e) {
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2014-04-20 12:39:46.000000000 -0700
@@ -20,28 +20,27 @@
package com.sun.org.apache.xerces.internal.jaxp.validation;
@@ -10944,7 +12231,7 @@
return config;
}
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2014-04-20 12:39:46.000000000 -0700
@@ -49,10 +49,10 @@
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
import com.sun.org.apache.xerces.internal.util.Status;
@@ -10972,7 +12259,7 @@
try {
reader.setProperty(SECURITY_MANAGER, securityManager);
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2014-04-20 12:39:46.000000000 -0700
@@ -41,10 +41,10 @@
import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
import com.sun.org.apache.xerces.internal.util.SAXInputSource;
@@ -11100,7 +12387,7 @@
}
catch (XMLConfigurationException e) {
--- jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -39,9 +39,9 @@
import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
@@ -11207,7 +12494,7 @@
/**
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2014-04-20 12:39:46.000000000 -0700
@@ -20,18 +20,15 @@
package com.sun.org.apache.xerces.internal.parsers;
@@ -11288,7 +12575,7 @@
//
// Default handling
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2014-04-20 12:39:46.000000000 -0700
@@ -29,6 +29,7 @@
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
import com.sun.org.apache.xerces.internal.util.Status;
@@ -11353,7 +12640,7 @@
fConfiguration.setProperty(propertyId, value);
}
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2014-04-20 12:39:46.000000000 -0700
@@ -38,7 +38,6 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
@@ -11390,7 +12677,7 @@
//
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2014-04-20 12:39:46.000000000 -0700
@@ -36,7 +36,6 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
@@ -11427,7 +12714,7 @@
//
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2014-04-20 12:39:46.000000000 -0700
@@ -22,6 +22,7 @@
import com.sun.org.apache.xerces.internal.impl.Constants;
@@ -11499,7 +12786,7 @@
}
} // class SAXParser
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2014-04-20 12:39:46.000000000 -0700
@@ -23,8 +23,8 @@
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -11528,7 +12815,7 @@
} // class SecurityConfiguration
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2014-04-20 12:39:46.000000000 -0700
@@ -52,6 +52,7 @@
import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
import com.sun.org.apache.xerces.internal.util.PropertyState;
@@ -11679,7 +12966,7 @@
if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) {
XMLMessageFormatter xmft = new XMLMessageFormatter();
--- jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2014-04-20 12:39:46.000000000 -0700
@@ -23,6 +23,8 @@
import java.io.IOException;
@@ -11720,7 +13007,7 @@
reset();
fConfiguration.parse(inputSource);
--- jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -61,8 +61,6 @@
package com.sun.org.apache.xerces.internal.util;
@@ -11819,7 +13106,7 @@
- }
} // class SecurityManager
--- jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2014-04-20 12:39:46.000000000 -0700
@@ -173,7 +173,7 @@
for (int i = 0; i < length; i++) {
code = code * 37 + symbol.charAt(i);
@@ -11838,8 +13125,53 @@
} // hash(char[],int,int):int
+--- jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java 2013-09-06 11:23:00.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java 2014-04-20 12:39:46.000000000 -0700
+@@ -48,7 +48,8 @@
+ //
+ // Constants
+ //
+- private static final String DEFAULT_INTERNAL_CLASSES = "com.sun.org.apache.";
++ private static final String JAXP_INTERNAL = "com.sun.org.apache";
++ private static final String STAX_INTERNAL = "com.sun.xml.internal";
+
+ // name of default properties file to look for in JDK's jre/lib directory
+ private static final String DEFAULT_PROPERTIES_FILENAME = "xerces.properties";
+@@ -288,12 +289,8 @@
+ public static Class findProviderClass(String className, boolean doFallback)
+ throws ClassNotFoundException, ConfigurationError
+ {
+- if (System.getSecurityManager()!=null) {
+- return Class.forName(className);
+- } else {
+- return findProviderClass (className,
++ return findProviderClass (className,
+ findClassLoader (), doFallback);
+- }
+ }
+ /**
+ * Find a Class using the specified ClassLoader
+@@ -306,7 +303,8 @@
+ //restrict the access to package as speicified in java.security policy
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+- if (className.startsWith(DEFAULT_INTERNAL_CLASSES)) {
++ if (className.startsWith(JAXP_INTERNAL) ||
++ className.startsWith(STAX_INTERNAL)) {
+ cl = null;
+ } else {
+ final int lastDot = className.lastIndexOf(".");
+@@ -318,7 +316,7 @@
+ Class providerClass;
+ if (cl == null) {
+ //use the bootstrap ClassLoader.
+- providerClass = Class.forName(className);
++ providerClass = Class.forName(className, false, ObjectFactory.class.getClassLoader());
+ } else {
+ try {
+ providerClass = cl.loadClass(className);
--- jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2014-04-20 12:39:46.000000000 -0700
@@ -0,0 +1,237 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -12079,7 +13411,7 @@
+ }
+}
--- jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -0,0 +1,540 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
@@ -12622,7 +13954,7 @@
+ }
+}
--- jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2014-04-20 12:39:46.000000000 -0700
@@ -91,6 +91,24 @@
readSystemProperties();
}
@@ -12673,7 +14005,7 @@
* Return the value of the specified property
*
--- jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2013-09-06 11:23:00.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2014-04-20 12:39:47.000000000 -0700
@@ -37,7 +37,6 @@
import com.sun.org.apache.xerces.internal.util.HTTPInputSource;
import com.sun.org.apache.xerces.internal.util.IntStack;
@@ -12720,7 +14052,7 @@
fChildConfig.setProperty(propertyId, value);
}
--- jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2013-09-06 11:23:01.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2014-04-20 12:39:47.000000000 -0700
@@ -20,6 +20,7 @@
package com.sun.org.apache.xerces.internal.xni.parser;
@@ -12736,7 +14068,7 @@
+ public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer);
} // interface XMLDTDScanner
--- jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2013-09-06 11:23:02.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2014-04-20 12:39:47.000000000 -0700
@@ -24,20 +24,17 @@
package com.sun.org.apache.xml.internal.resolver;
@@ -12772,7 +14104,7 @@
debug.message(1,"Catalog class named '"
+ catalogClassName
--- jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2013-09-06 11:23:02.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2014-04-20 12:39:47.000000000 -0700
@@ -23,24 +23,21 @@
package com.sun.org.apache.xml.internal.resolver.readers;
@@ -12816,7 +14148,7 @@
catalog.getCatalogManager().debug.message(1, "Cannot load XML Catalog Parser class", domParserClass);
throw new CatalogException(CatalogException.UNPARSEABLE);
--- jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2013-09-06 11:23:02.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2014-01-18 12:16:08.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2014-04-20 12:39:47.000000000 -0700
@@ -23,19 +23,21 @@
package com.sun.org.apache.xml.internal.resolver.readers;
@@ -12886,8 +14218,245 @@
saxParser.setCatalog(catalog);
saxParser.startDocument();
+--- jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java 2013-09-06 11:23:02.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java 2014-04-20 12:39:47.000000000 -0700
+@@ -22,6 +22,11 @@
+ */
+ package com.sun.org.apache.xml.internal.serializer;
+
++import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
++import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
++import com.sun.org.apache.xml.internal.serializer.utils.SystemIDResolver;
++import com.sun.org.apache.xml.internal.serializer.utils.Utils;
++import com.sun.org.apache.xml.internal.serializer.utils.WrappedRuntimeException;
+ import java.io.BufferedReader;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
+@@ -29,19 +34,11 @@
+ import java.net.URL;
+ import java.util.Enumeration;
+ import java.util.HashMap;
++import java.util.Locale;
+ import java.util.PropertyResourceBundle;
+ import java.util.ResourceBundle;
+-import java.security.AccessController;
+-import java.security.PrivilegedAction;
+-
+ import javax.xml.transform.TransformerException;
+
+-import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
+-import com.sun.org.apache.xml.internal.serializer.utils.SystemIDResolver;
+-import com.sun.org.apache.xml.internal.serializer.utils.Utils;
+-import com.sun.org.apache.xml.internal.serializer.utils.WrappedRuntimeException;
+-import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
+-
+ /**
+ * This class provides services that tell if a character should have
+ * special treatement, such as entity reference substitution or normalization
+@@ -176,13 +173,19 @@
+ // file
+ // 3) try treating the resource a URI
+
+- if (internal) {
+- try {
++ try {
++ if (internal) {
+ // Load entity property files by using PropertyResourceBundle,
+ // cause of security issure for applets
+ entities = PropertyResourceBundle.getBundle(entitiesResource);
+- } catch (Exception e) {}
+- }
++ } else {
++ ClassLoader cl = SecuritySupport.getContextClassLoader();
++ if (cl != null) {
++ entities = PropertyResourceBundle.getBundle(entitiesResource,
++ Locale.getDefault(), cl);
++ }
++ }
++ } catch (Exception e) {}
+
+ if (entities != null) {
+ Enumeration keys = entities.getKeys();
+@@ -198,6 +201,7 @@
+ set(S_CARRIAGERETURN);
+ } else {
+ InputStream is = null;
++ String err = null;
+
+ // Load user specified resource file by using URL loading, it
+ // requires a valid URI as parameter
+@@ -205,18 +209,22 @@
+ if (internal) {
+ is = CharInfo.class.getResourceAsStream(entitiesResource);
+ } else {
+- ClassLoader cl = ObjectFactory.findClassLoader();
+- if (cl == null) {
+- is = ClassLoader.getSystemResourceAsStream(entitiesResource);
+- } else {
+- is = cl.getResourceAsStream(entitiesResource);
++ ClassLoader cl = SecuritySupport.getContextClassLoader();
++ if (cl != null) {
++ try {
++ is = cl.getResourceAsStream(entitiesResource);
++ } catch (Exception e) {
++ err = e.getMessage();
++ }
+ }
+
+ if (is == null) {
+ try {
+ URL url = new URL(entitiesResource);
+ is = url.openStream();
+- } catch (Exception e) {}
++ } catch (Exception e) {
++ err = e.getMessage();
++ }
+ }
+ }
+
+@@ -224,7 +232,7 @@
+ throw new RuntimeException(
+ Utils.messages.createMessage(
+ MsgKey.ER_RESOURCE_COULD_NOT_FIND,
+- new Object[] {entitiesResource, entitiesResource}));
++ new Object[] {entitiesResource, err}));
+ }
+
+ // Fix Bugzilla#4000: force reading in UTF-8
+@@ -456,64 +464,56 @@
+ return isCleanTextASCII[value];
+ }
+
+-// In the future one might want to use the array directly and avoid
+-// the method call, but I think the JIT alreay inlines this well enough
+-// so don't do it (for now) - bjm
+-// public final boolean[] getASCIIClean()
+-// {
+-// return isCleanTextASCII;
+-// }
+-
+-
+- private static CharInfo getCharInfoBasedOnPrivilege(
+- final String entitiesFileName, final String method,
+- final boolean internal){
+- return (CharInfo) AccessController.doPrivileged(
+- new PrivilegedAction() {
+- public Object run() {
+- return new CharInfo(entitiesFileName,
+- method, internal);}
+- });
++
++ /**
++ * Read an internal resource file that describes the mapping of
++ * characters to entity references; Construct a CharInfo object.
++ *
++ * @param entitiesFileName Name of entities resource file that should
++ * be loaded, which describes the mapping of characters to entity references.
++ * @param method the output method type, which should be one of "xml", "html", and "text".
++ * @return an instance of CharInfo
++ *
++ * @xsl.usage internal
++ */
++ static CharInfo getCharInfoInternal(String entitiesFileName, String method)
++ {
++ CharInfo charInfo = (CharInfo) m_getCharInfoCache.get(entitiesFileName);
++ if (charInfo != null) {
++ return charInfo;
++ }
++
++ charInfo = new CharInfo(entitiesFileName, method, true);
++ m_getCharInfoCache.put(entitiesFileName, charInfo);
++ return charInfo;
+ }
+
+ /**
+- * Factory that reads in a resource file that describes the mapping of
+- * characters to entity references.
++ * Constructs a CharInfo object using the following process to try reading
++ * the entitiesFileName parameter:
++ *
++ * 1) attempt to load it as a ResourceBundle
++ * 2) try using the class loader to find the specified file
++ * 3) try opening it as an URI
+ *
+- * Resource files must be encoded in UTF-8 and have a format like:
++ * In case of 2 and 3, the resource file must be encoded in UTF-8 and have the
++ * following format:
+ * <pre>
+ * # First char # is a comment
+ * Entity numericValue
+ * quot 34
+ * amp 38
+ * </pre>
+- * (Note: Why don't we just switch to .properties files? Oct-01 -sc)
+ *
+- * @param entitiesResource Name of entities resource file that should
+- * be loaded, which describes that mapping of characters to entity references.
+- * @param method the output method type, which should be one of "xml", "html", "text"...
+- *
+- * @xsl.usage internal
++ * @param entitiesFileName Name of entities resource file that should
++ * be loaded, which describes the mapping of characters to entity references.
++ * @param method the output method type, which should be one of "xml", "html", and "text".
++ * @return an instance of CharInfo
+ */
+ static CharInfo getCharInfo(String entitiesFileName, String method)
+ {
+- CharInfo charInfo = (CharInfo) m_getCharInfoCache.get(entitiesFileName);
+- if (charInfo != null) {
+- return charInfo;
+- }
+-
+- // try to load it internally - cache
+- try {
+- charInfo = getCharInfoBasedOnPrivilege(entitiesFileName,
+- method, true);
+- m_getCharInfoCache.put(entitiesFileName, charInfo);
+- return charInfo;
+- } catch (Exception e) {}
+-
+- // try to load it externally - do not cache
+ try {
+- return getCharInfoBasedOnPrivilege(entitiesFileName,
+- method, false);
++ return new CharInfo(entitiesFileName, method, false);
+ } catch (Exception e) {}
+
+ String absoluteEntitiesFileName;
+@@ -530,8 +530,7 @@
+ }
+ }
+
+- return getCharInfoBasedOnPrivilege(entitiesFileName,
+- method, false);
++ return new CharInfo(absoluteEntitiesFileName, method, false);
+ }
+
+ /** Table of user-specified char infos. */
+--- jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2013-09-06 11:23:02.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2014-04-20 12:39:47.000000000 -0700
+@@ -60,7 +60,7 @@
+ */
+ private static final CharInfo m_htmlcharInfo =
+ // new CharInfo(CharInfo.HTML_ENTITIES_RESOURCE);
+- CharInfo.getCharInfo(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML);
++ CharInfo.getCharInfoInternal(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML);
+
+ /** A digital search trie for fast, case insensitive lookup of ElemDesc objects. */
+ static final Trie m_elementFlags = new Trie();
+--- jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java 2013-09-06 11:23:02.000000000 -0700
++++ jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java 2014-04-20 12:39:47.000000000 -0700
+@@ -58,7 +58,7 @@
+ */
+ private static CharInfo m_xmlcharInfo =
+ // new CharInfo(CharInfo.XML_ENTITIES_RESOURCE);
+- CharInfo.getCharInfo(CharInfo.XML_ENTITIES_RESOURCE, Method.XML);
++ CharInfo.getCharInfoInternal(CharInfo.XML_ENTITIES_RESOURCE, Method.XML);
+
+ /**
+ * Default constructor.
--- jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2013-09-06 11:23:03.000000000 -0700
-+++ jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2014-04-20 12:39:48.000000000 -0700
@@ -25,12 +25,15 @@
import com.sun.org.apache.xalan.internal.XalanConstants;
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
@@ -12994,7 +14563,7 @@
}
}
--- jaxp/src/javax/xml/stream/FactoryFinder.java 2013-09-06 11:23:04.000000000 -0700
-+++ jaxp/src/javax/xml/stream/FactoryFinder.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/javax/xml/stream/FactoryFinder.java 2014-04-20 12:39:48.000000000 -0700
@@ -204,13 +204,15 @@
* a property name
* @param fallbackClassName Implementation class name, if nothing else
@@ -13052,7 +14621,7 @@
// Try read $java.home/lib/stax.properties followed by
--- jaxp/src/javax/xml/stream/XMLEventFactory.java 2013-09-06 11:23:04.000000000 -0700
-+++ jaxp/src/javax/xml/stream/XMLEventFactory.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/javax/xml/stream/XMLEventFactory.java 2014-04-20 12:39:48.000000000 -0700
@@ -60,9 +60,7 @@
public static XMLEventFactory newInstance()
throws FactoryConfigurationError
@@ -13096,7 +14665,7 @@
throw new FactoryConfigurationError(e.getException(),
e.getMessage());
--- jaxp/src/javax/xml/stream/XMLInputFactory.java 2013-09-06 11:23:04.000000000 -0700
-+++ jaxp/src/javax/xml/stream/XMLInputFactory.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/javax/xml/stream/XMLInputFactory.java 2014-04-20 12:39:48.000000000 -0700
@@ -139,6 +139,7 @@
public static final String ALLOCATOR=
"javax.xml.stream.allocator";
@@ -13148,7 +14717,7 @@
throw new FactoryConfigurationError(e.getException(),
e.getMessage());
--- jaxp/src/javax/xml/stream/XMLOutputFactory.java 2013-09-06 11:23:04.000000000 -0700
-+++ jaxp/src/javax/xml/stream/XMLOutputFactory.java 2013-12-01 11:13:41.000000000 -0800
++++ jaxp/src/javax/xml/stream/XMLOutputFactory.java 2014-04-20 12:39:48.000000000 -0700
@@ -115,6 +115,7 @@
public static final String IS_REPAIRING_NAMESPACES=
"javax.xml.stream.isRepairingNamespaces";
@@ -13198,7 +14767,7 @@
throw new FactoryConfigurationError(e.getException(),
e.getMessage());
--- jaxws/.hgtags 2013-09-06 11:23:51.000000000 -0700
-+++ jaxws/.hgtags 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/.hgtags 2014-04-20 12:39:43.000000000 -0700
@@ -123,6 +123,7 @@
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -13230,7 +14799,7 @@
4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12
6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13
03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14
-@@ -343,3 +360,38 @@
+@@ -343,3 +360,60 @@
89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42
3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43
cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
@@ -13256,6 +14825,9 @@
+65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
+c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
+6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31
++e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33
++e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34
++c654ba4b2392c2913f45b495a2ea0c53cc348d98 jdk7u45-b35
+5524cced32d3959d95ed414add230273bc10c38d jdk7u51-b00
+db9e3328f393313e52cbf3fee5236aa2429028d0 jdk7u51-b01
+92a4787cb3617005a329fb49247c550e8d7eb47a jdk7u51-b02
@@ -13269,8 +14841,294 @@
+53a566a724e59f31bbd25a6a21f0f36adb36e82b jdk7u51-b10
+708507f4795cad1f0cf7e19ff2dc16fe9d441754 jdk7u51-b11
+7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u51-b12
++81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13
++5dbeb9983f104be717da35c9b14923d71dd248d7 jdk7u51-b30
++eb79f394916efba85f4f6c7ef562966699f2c1e8 jdk7u51-b31
++7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u55-b00
++c5eb0c2a0f9715b510bc641506fb90df9bf05ab0 jdk7u55-b01
++a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02
++2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03
++f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04
++8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u55-b05
++2696d6747826cea92a97b2d80be4a59ff99462bd jdk7u55-b06
++1ad971afe2b5db93420654fa65b23f827760fed7 jdk7u55-b07
++57ba92e96b7fb6f4543038c1daa390c45d8a9d84 jdk7u55-b08
++c9d8555964a581486f4c8e1bf5f5db678eb3b9f2 jdk7u55-b09
++0f469a7307b98e911aaaab8cad781eab3bd94ad6 jdk7u55-b09
++1080e907d64ab63c6138b1a61d9e5b826e83634a jdk7u55-b10
++0db5b891d1ba10211da0a8158551b35f00da7684 jdk7u55-b11
++3834eb921dfd8d29d917a0c57bb9fdd9aa58c209 jdk7u55-b12
++3b0da73591b1ea23c48aa7babc34ed776fc183f0 jdk7u55-b13
++5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
+--- jaxws/src/share/jaf_classes/javax/activation/CommandMap.java 2013-09-06 11:23:51.000000000 -0700
++++ jaxws/src/share/jaf_classes/javax/activation/CommandMap.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,6 +25,9 @@
+
+ package javax.activation;
+
++import java.util.Map;
++import java.util.WeakHashMap;
++
+
+ /**
+ * The CommandMap class provides an interface to a registry of
+@@ -38,6 +41,8 @@
+ */
+ public abstract class CommandMap {
+ private static CommandMap defaultCommandMap = null;
++ private static Map<ClassLoader,CommandMap> map =
++ new WeakHashMap<ClassLoader,CommandMap>();
+
+ /**
+ * Get the default CommandMap.
+@@ -56,11 +61,18 @@
+ *
+ * @return the CommandMap
+ */
+- public static CommandMap getDefaultCommandMap() {
+- if (defaultCommandMap == null)
+- defaultCommandMap = new MailcapCommandMap();
+-
+- return defaultCommandMap;
++ public static synchronized CommandMap getDefaultCommandMap() {
++ if (defaultCommandMap != null)
++ return defaultCommandMap;
++
++ // fetch per-thread-context-class-loader default
++ ClassLoader tccl = SecuritySupport.getContextClassLoader();
++ CommandMap def = map.get(tccl);
++ if (def == null) {
++ def = new MailcapCommandMap();
++ map.put(tccl, def);
++ }
++ return def;
+ }
+
+ /**
+@@ -71,7 +83,7 @@
+ * @exception SecurityException if the caller doesn't have permission
+ * to change the default
+ */
+- public static void setDefaultCommandMap(CommandMap commandMap) {
++ public static synchronized void setDefaultCommandMap(CommandMap commandMap) {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+ try {
+@@ -79,13 +91,16 @@
+ security.checkSetFactory();
+ } catch (SecurityException ex) {
+ // otherwise, we also allow it if this code and the
+- // factory come from the same class loader (e.g.,
++ // factory come from the same (non-system) class loader (e.g.,
+ // the JAF classes were loaded with the applet classes).
+- if (CommandMap.class.getClassLoader() !=
++ if (CommandMap.class.getClassLoader() == null ||
++ CommandMap.class.getClassLoader() !=
+ commandMap.getClass().getClassLoader())
+ throw ex;
+ }
+ }
++ // remove any per-thread-context-class-loader CommandMap
++ map.remove(SecuritySupport.getContextClassLoader());
+ defaultCommandMap = commandMap;
+ }
+
+--- jaxws/src/share/jaf_classes/javax/activation/DataHandler.java 2013-09-06 11:23:51.000000000 -0700
++++ jaxws/src/share/jaf_classes/javax/activation/DataHandler.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -368,7 +368,12 @@
+ // if it's not set, set it...
+ if (transferFlavors == emptyFlavors)
+ transferFlavors = getDataContentHandler().getTransferDataFlavors();
+- return transferFlavors;
++
++ if (transferFlavors == emptyFlavors)
++ return transferFlavors;
++ else
++ return transferFlavors.clone();
++
+ }
+
+ /**
+--- jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java 2013-09-06 11:23:51.000000000 -0700
++++ jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,6 +26,8 @@
+ package javax.activation;
+
+ import java.io.File;
++import java.util.Map;
++import java.util.WeakHashMap;
+
+ /**
+ * The FileTypeMap is an abstract class that provides a data typing
+@@ -48,6 +50,8 @@
+ public abstract class FileTypeMap {
+
+ private static FileTypeMap defaultMap = null;
++ private static Map<ClassLoader,FileTypeMap> map =
++ new WeakHashMap<ClassLoader,FileTypeMap>();
+
+ /**
+ * The default constructor.
+@@ -78,11 +82,11 @@
+ * Sets the default FileTypeMap for the system. This instance
+ * will be returned to callers of getDefaultFileTypeMap.
+ *
+- * @param map The FileTypeMap.
++ * @param fileTypeMap The FileTypeMap.
+ * @exception SecurityException if the caller doesn't have permission
+ * to change the default
+ */
+- public static void setDefaultFileTypeMap(FileTypeMap map) {
++ public static synchronized void setDefaultFileTypeMap(FileTypeMap fileTypeMap) {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+ try {
+@@ -90,14 +94,17 @@
+ security.checkSetFactory();
+ } catch (SecurityException ex) {
+ // otherwise, we also allow it if this code and the
+- // factory come from the same class loader (e.g.,
++ // factory come from the same (non-system) class loader (e.g.,
+ // the JAF classes were loaded with the applet classes).
+- if (FileTypeMap.class.getClassLoader() !=
+- map.getClass().getClassLoader())
++ if (FileTypeMap.class.getClassLoader() == null ||
++ FileTypeMap.class.getClassLoader() !=
++ fileTypeMap.getClass().getClassLoader())
+ throw ex;
+ }
+ }
+- defaultMap = map;
++ // remove any per-thread-context-class-loader FileTypeMap
++ map.remove(SecuritySupport.getContextClassLoader());
++ defaultMap = fileTypeMap;
+ }
+
+ /**
+@@ -109,10 +116,17 @@
+ * @return The default FileTypeMap
+ * @see javax.activation.FileTypeMap#setDefaultFileTypeMap
+ */
+- public static FileTypeMap getDefaultFileTypeMap() {
+- // XXX - probably should be synchronized
+- if (defaultMap == null)
+- defaultMap = new MimetypesFileTypeMap();
+- return defaultMap;
++ public static synchronized FileTypeMap getDefaultFileTypeMap() {
++ if (defaultMap != null)
++ return defaultMap;
++
++ // fetch per-thread-context-class-loader default
++ ClassLoader tccl = SecuritySupport.getContextClassLoader();
++ FileTypeMap def = map.get(tccl);
++ if (def == null) {
++ def = new MimetypesFileTypeMap();
++ map.put(tccl, def);
++ }
++ return def;
+ }
+ }
+--- jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java 2013-09-06 11:23:51.000000000 -0700
++++ jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -120,11 +120,7 @@
+ public class MailcapCommandMap extends CommandMap {
+ /*
+ * We manage a collection of databases, searched in order.
+- * The default database is shared between all instances
+- * of this class.
+- * XXX - Can we safely share more databases between instances?
+ */
+- private static MailcapFile defDB = null;
+ private MailcapFile[] DB;
+ private static final int PROG = 0; // programmatically added entries
+
+@@ -164,14 +160,10 @@
+ loadAllResources(dbv, "META-INF/mailcap");
+
+ LogSupport.log("MailcapCommandMap: load DEF");
+- synchronized (MailcapCommandMap.class) {
+- // see if another instance has created this yet.
+- if (defDB == null)
+- defDB = loadResource("/META-INF/mailcap.default");
+- }
++ mf = loadResource("/META-INF/mailcap.default");
+
+- if (defDB != null)
+- dbv.add(defDB);
++ if (mf != null)
++ dbv.add(mf);
+
+ DB = new MailcapFile[dbv.size()];
+ DB = (MailcapFile[])dbv.toArray(DB);
+--- jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java 2013-09-06 11:23:51.000000000 -0700
++++ jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -69,11 +69,7 @@
+ public class MimetypesFileTypeMap extends FileTypeMap {
+ /*
+ * We manage a collection of databases, searched in order.
+- * The default database is shared between all instances
+- * of this class.
+- * XXX - Can we safely share more databases between instances?
+ */
+- private static MimeTypeFile defDB = null;
+ private MimeTypeFile[] DB;
+ private static final int PROG = 0; // programmatically added entries
+
+@@ -114,14 +110,10 @@
+ loadAllResources(dbv, "META-INF/mime.types");
+
+ LogSupport.log("MimetypesFileTypeMap: load DEF");
+- synchronized (MimetypesFileTypeMap.class) {
+- // see if another instance has created this yet.
+- if (defDB == null)
+- defDB = loadResource("/META-INF/mimetypes.default");
+- }
++ mf = loadResource("/META-INF/mimetypes.default");
+
+- if (defDB != null)
+- dbv.addElement(defDB);
++ if (mf != null)
++ dbv.addElement(mf);
+
+ DB = new MimeTypeFile[dbv.size()];
+ dbv.copyInto(DB);
--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2013-09-06 11:23:52.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13300,8 +15158,180 @@
}
public boolean isBridgeMethod(MethodDeclaration method) {
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.tools.internal.ws.wsdl.parser;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java 2013-09-06 11:23:54.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -65,8 +65,15 @@
+ * @author Vivek Pandey
+ */
+ public class Internalizer {
+- private static final XPathFactory xpf = XPathFactory.newInstance();
+- private final XPath xpath = xpf.newXPath();
++
++ private static final ContextClassloaderLocal<XPathFactory> xpf = new ContextClassloaderLocal<XPathFactory>() {
++ @Override
++ protected XPathFactory initialValue() throws Exception {
++ return XPathFactory.newInstance();
++ }
++ };
++
++ private final XPath xpath = xpf.get().newXPath();
+ private final WsimportOptions options;
+ private final DOMForest forest;
+ private final ErrorReceiver errorReceiver;
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java 2013-09-06 11:23:54.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -56,8 +56,14 @@
+ */
+ public class JAXWSBindingExtensionHandler extends AbstractExtensionHandler {
+
+- private static final XPathFactory xpf = XPathFactory.newInstance();
+- private final XPath xpath = xpf.newXPath();
++ private static final ContextClassloaderLocal<XPathFactory> xpf = new ContextClassloaderLocal<XPathFactory>() {
++ @Override
++ protected XPathFactory initialValue() throws Exception {
++ return XPathFactory.newInstance();
++ }
++ };
++
++ private final XPath xpath = xpf.get().newXPath();
+
+ public JAXWSBindingExtensionHandler(Map<String, AbstractExtensionHandler> extensionHandlerMap) {
+ super(extensionHandlerMap);
--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2013-09-06 11:23:55.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13326,7 +15356,7 @@
}
}
--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2013-09-06 11:23:55.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13373,7 +15403,7 @@
}
--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -13460,8 +15490,304 @@
+ private Utils() {
+ }
+}
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.tools.internal.xjc.reader.internalizer;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java 2013-09-06 11:23:56.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -75,9 +75,14 @@
+
+ private static final String WSDL_NS = "http://schemas.xmlsoap.org/wsdl/";
+
+- private static final XPathFactory xpf = XPathFactory.newInstance();
++ private static final ContextClassloaderLocal<XPathFactory> xpf = new ContextClassloaderLocal<XPathFactory>() {
++ @Override
++ protected XPathFactory initialValue() throws Exception {
++ return XPathFactory.newInstance();
++ }
++ };
+
+- private final XPath xpath = xpf.newXPath();
++ private final XPath xpath = xpf.get().newXPath();
+
+ /**
+ * Internalize all &lt;jaxb:bindings> customizations in the given forest.
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java 2013-09-06 11:23:57.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -27,9 +27,14 @@
+
+ import java.math.BigDecimal;
+ import java.math.BigInteger;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.Calendar;
++import java.util.Collections;
+ import java.util.GregorianCalendar;
++import java.util.Map;
+ import java.util.TimeZone;
++import java.util.WeakHashMap;
+
+ import javax.xml.bind.DatatypeConverter;
+ import javax.xml.bind.DatatypeConverterInterface;
+@@ -352,7 +357,7 @@
+
+ public static GregorianCalendar _parseDateTime(CharSequence s) {
+ String val = WhiteSpaceProcessor.trim(s).toString();
+- return datatypeFactory.newXMLGregorianCalendar(val).toGregorianCalendar();
++ return getDatatypeFactory().newXMLGregorianCalendar(val).toGregorianCalendar();
+ }
+
+ public static String _printDateTime(Calendar val) {
+@@ -718,14 +723,30 @@
+ }
+ return false;
+ }
+- private static final DatatypeFactory datatypeFactory;
+
+- static {
+- try {
+- datatypeFactory = DatatypeFactory.newInstance();
+- } catch (DatatypeConfigurationException e) {
+- throw new Error(e);
++ private static final Map<ClassLoader, DatatypeFactory> DF_CACHE = Collections.synchronizedMap(new WeakHashMap<ClassLoader, DatatypeFactory>());
++
++ public static DatatypeFactory getDatatypeFactory() {
++ ClassLoader tccl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
++ public ClassLoader run() {
++ return Thread.currentThread().getContextClassLoader();
++ }
++ });
++ DatatypeFactory df = DF_CACHE.get(tccl);
++ if (df == null) {
++ synchronized (DatatypeConverterImpl.class) {
++ df = DF_CACHE.get(tccl);
++ if (df == null) { // to prevent multiple initialization
++ try {
++ df = DatatypeFactory.newInstance();
++ } catch (DatatypeConfigurationException e) {
++ throw new Error(Messages.FAILED_TO_INITIALE_DATATYPE_FACTORY.format(),e);
++ }
++ DF_CACHE.put(tccl, df);
++ }
++ }
+ }
++ return df;
+ }
+
+ private static final class CalendarFormatter {
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,48 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.bind;
++
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++
++/**
++ * Message resources
++ */
++enum Messages {
++ FAILED_TO_INITIALE_DATATYPE_FACTORY, // 0 args
++ ;
++
++ private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
++
++ @Override
++ public String toString() {
++ return format();
++ }
++
++ public String format( Object... args ) {
++ return MessageFormat.format( rb.getString(name()), args );
++ }
++}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++
++FAILED_TO_INITIALE_DATATYPE_FACTORY = \
++ Failed to initialize JAXP 1.3 DatatypeFactory class.
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2013-09-06 11:23:57.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13487,7 +15813,7 @@
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2013-09-06 11:23:57.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13519,7 +15845,7 @@
}
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -13606,8 +15932,44 @@
+ private Utils() {
+ }
+}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java 2013-09-06 11:23:58.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -60,7 +60,6 @@
+ PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY, // 2 args
+
+ INVALID_XML_ENUM_VALUE, // 2 arg
+- FAILED_TO_INITIALE_DATATYPE_FACTORY, // 0 args
+ NO_IMAGE_WRITER, // 1 arg
+
+ ILLEGAL_MIME_TYPE, // 2 args
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties 2013-09-06 11:23:58.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -86,9 +86,6 @@
+ INVALID_XML_ENUM_VALUE = \
+ "{0}" is not a valid value for {1}.
+
+-FAILED_TO_INITIALE_DATATYPE_FACTORY = \
+- Failed to initialize JAXP 1.3 DatatypeFactory class.
+-
+ NO_IMAGE_WRITER = \
+ No javax.imageio.ImageWriter is available for the specified MIME type "{0}"
+
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2014-04-20 12:39:38.000000000 -0700
@@ -235,7 +235,7 @@
String pkg = nav.getPackageName(ci.getClazz());
if(!registries.containsKey(pkg)) {
@@ -13634,7 +15996,7 @@
* Checks the uniqueness of the type name.
*/
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13659,8 +16021,68 @@
}
public <V> Transducer<V> getTransducer() {
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java 2013-09-06 11:23:58.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -60,9 +60,7 @@
+ import javax.imageio.stream.ImageOutputStream;
+ import javax.xml.bind.ValidationEvent;
+ import javax.xml.bind.helpers.ValidationEventImpl;
+-import javax.xml.datatype.DatatypeConfigurationException;
+ import javax.xml.datatype.DatatypeConstants;
+-import javax.xml.datatype.DatatypeFactory;
+ import javax.xml.datatype.Duration;
+ import javax.xml.datatype.XMLGregorianCalendar;
+ import javax.xml.namespace.QName;
+@@ -565,7 +563,8 @@
+
+ public XMLGregorianCalendar parse(CharSequence lexical) throws SAXException {
+ try {
+- return datatypeFactory.newXMLGregorianCalendar(lexical.toString().trim()); // (.trim() - issue 396)
++ return DatatypeConverterImpl.getDatatypeFactory()
++ .newXMLGregorianCalendar(lexical.toString().trim()); // (.trim() - issue 396)
+ } catch (Exception e) {
+ UnmarshallingContext.getInstance().handleError(e);
+ return null;
+@@ -835,7 +834,7 @@
+
+ public Duration parse(CharSequence lexical) {
+ TODO.checkSpec("JSR222 Issue #42");
+- return datatypeFactory.newDuration(lexical.toString());
++ return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
+ }
+ });
+ primaryList.add(
+@@ -876,21 +875,6 @@
+ }
+ }
+
+-
+- /**
+- * Cached instance of {@link DatatypeFactory} to create
+- * {@link XMLGregorianCalendar} and {@link Duration}.
+- */
+- private static final DatatypeFactory datatypeFactory = init();
+-
+- private static DatatypeFactory init() {
+- try {
+- return DatatypeFactory.newInstance();
+- } catch (DatatypeConfigurationException e) {
+- throw new Error(Messages.FAILED_TO_INITIALE_DATATYPE_FACTORY.format(),e);
+- }
+- }
+-
+ private static void checkXmlGregorianCalendarFieldRef(QName type,
+ XMLGregorianCalendar cal)throws javax.xml.bind.MarshalException{
+ StringBuilder buf = new StringBuilder();
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13686,7 +16108,7 @@
public RuntimeClassInfo getScope() {
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13724,7 +16146,7 @@
protected RuntimeTypeInfoSetImpl createTypeInfoSet() {
return new RuntimeTypeInfoSetImpl(reader);
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13763,7 +16185,7 @@
return (RuntimeNonElement)super.getTypeInfo(type);
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -13851,7 +16273,7 @@
+ }
+}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13888,7 +16310,7 @@
/**
* Returns true if this method is a bridge method as defined in JLS.
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -13972,7 +16394,7 @@
String name = method.getName();
Class[] params = method.getParameterTypes();
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -13996,7 +16418,7 @@
- ReflectionNavigator getNavigator();
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14026,7 +16448,7 @@
constructor = null;
else {
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14079,7 +16501,7 @@
}
return xsdgen;
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14166,8 +16588,75 @@
+ private Utils() {
+ }
+}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2013-09-06 11:23:58.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -33,7 +33,6 @@
+
+ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
+-import com.sun.xml.internal.bind.v2.util.ClassLoaderRetriever;
+
+ import org.xml.sax.SAXException;
+
+@@ -153,7 +152,6 @@
+ }
+ }
+
+-
+ /**
+ * Reference to FI's XMLStreamWriter class, if FI can be loaded.
+ */
+@@ -162,9 +160,8 @@
+
+ private static Class initFIStAXWriterClass() {
+ try {
+- ClassLoader loader = ClassLoaderRetriever.getClassLoader();
+- Class llfisw = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter", true, loader);
+- Class sds = loader.loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
++ Class<?> llfisw = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter");
++ Class<?> sds = Class.forName("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
+ // Check if StAXDocumentSerializer implements LowLevelFastInfosetStreamWriter
+ if (llfisw.isAssignableFrom(sds))
+ return sds;
+@@ -179,8 +176,7 @@
+ try {
+ if (FI_STAX_WRITER_CLASS == null)
+ return null;
+- ClassLoader loader = ClassLoaderRetriever.getClassLoader();
+- Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput", true, loader);
++ Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput");
+ return c.getConstructor(FI_STAX_WRITER_CLASS, JAXBContextImpl.class);
+ } catch (Throwable e) {
+ return null;
+@@ -195,8 +191,7 @@
+
+ private static Class initStAXExWriterClass() {
+ try {
+- ClassLoader loader = ClassLoaderRetriever.getClassLoader();
+- return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx",true,loader);
++ return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx");
+ } catch (Throwable e) {
+ return null;
+ }
+@@ -204,8 +199,7 @@
+
+ private static Constructor<? extends XmlOutput> initStAXExOutputClass() {
+ try {
+- ClassLoader loader = ClassLoaderRetriever.getClassLoader();
+- Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput",true, loader);
++ Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput");
+ return c.getConstructor(STAXEX_WRITER_CLASS);
+ } catch (Throwable e) {
+ return null;
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14193,7 +16682,7 @@
acc = prop.getAccessor().optimize(context);
assert acc!=null;
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14220,7 +16709,7 @@
// TODO: error check for mapImplClass==null
// what is the error reporting path for this part of the code?
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14308,7 +16797,7 @@
+ }
+}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2013-09-06 11:23:58.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14334,7 +16823,7 @@
adapter.adapterType);
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2013-09-06 11:23:59.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14372,7 +16861,7 @@
itemType = Object.class;
l = new CollectionLister(getImplClass(rawType));
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2013-09-06 11:23:59.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2014-04-20 12:39:38.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14399,7 +16888,7 @@
if(prop.id()==ID.IDREF)
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 2014-04-20 12:39:38.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14486,8 +16975,610 @@
+ private Utils() {
+ }
+}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java 2013-09-06 11:23:59.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -33,7 +33,6 @@
+ import javax.xml.stream.XMLStreamReader;
+
+ import com.sun.xml.internal.bind.WhiteSpaceProcessor;
+-import com.sun.xml.internal.bind.v2.util.ClassLoaderRetriever;
+
+ import org.xml.sax.Attributes;
+ import org.xml.sax.SAXException;
+@@ -337,9 +336,8 @@
+
+ private static Class initFIStAXReaderClass() {
+ try {
+- ClassLoader cl = getClassLoader();
+- Class fisr = cl.loadClass("com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader");
+- Class sdp = cl.loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
++ Class<?> fisr = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader");
++ Class<?> sdp = Class.forName("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
+ // Check if StAXDocumentParser implements FastInfosetStreamReader
+ if (fisr.isAssignableFrom(sdp))
+ return sdp;
+@@ -355,7 +353,7 @@
+ if (FI_STAX_READER_CLASS == null)
+ return null;
+
+- Class c = getClassLoader().loadClass(
++ Class c = Class.forName(
+ "com.sun.xml.internal.bind.v2.runtime.unmarshaller.FastInfosetConnector");
+ return c.getConstructor(FI_STAX_READER_CLASS,XmlVisitor.class);
+ } catch (Throwable e) {
+@@ -371,7 +369,7 @@
+
+ private static Class initStAXExReader() {
+ try {
+- return getClassLoader().loadClass("com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx");
++ return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx");
+ } catch (Throwable e) {
+ return null;
+ }
+@@ -379,15 +377,10 @@
+
+ private static Constructor<? extends StAXConnector> initStAXExConnector() {
+ try {
+- Class c = getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.unmarshaller.StAXExConnector");
++ Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.unmarshaller.StAXExConnector");
+ return c.getConstructor(STAX_EX_READER_CLASS,XmlVisitor.class);
+ } catch (Throwable e) {
+ return null;
+ }
+ }
+-
+- public static ClassLoader getClassLoader() {
+- return ClassLoaderRetriever.getClassLoader();
+- }
+-
+ }
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2013-09-06 11:24:01.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -62,61 +62,6 @@
+ Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
+ "com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
+
+- static {
+- try {
+- CommandMap map = CommandMap.getDefaultCommandMap();
+- if (map instanceof MailcapCommandMap) {
+- MailcapCommandMap mailMap = (MailcapCommandMap) map;
+- String hndlrStr = ";;x-java-content-handler=";
+- mailMap.addMailcap(
+- "text/xml"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
+- mailMap.addMailcap(
+- "application/xml"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
+- mailMap.addMailcap(
+- "application/fastinfoset"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler");
+- /* Image DataContentHandler handles all image types
+- mailMap.addMailcap(
+- "image/jpeg"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.JpegDataContentHandler");
+- mailMap.addMailcap(
+- "image/gif"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler"); */
+- /*mailMap.addMailcap(
+- "multipart/*"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");*/
+- mailMap.addMailcap(
+- "image/*"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler");
+- mailMap.addMailcap(
+- "text/plain"
+- + hndlrStr
+- + "com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler");
+- } else {
+- throw new SOAPExceptionImpl("Default CommandMap is not a MailcapCommandMap");
+- }
+- } catch (Throwable t) {
+- log.log(
+- Level.SEVERE,
+- "SAAJ0508.soap.cannot.register.handlers",
+- t);
+- if (t instanceof RuntimeException) {
+- throw (RuntimeException) t;
+- } else {
+- throw new RuntimeException(t.getLocalizedMessage());
+- }
+- }
+- };
+-
+ private final MimeHeaders headers;
+ private MimeBodyPart rawContent = null;
+ private DataHandler dataHandler = null;
+@@ -126,6 +71,12 @@
+
+ public AttachmentPartImpl() {
+ headers = new MimeHeaders();
++
++ // initialization from here should cover most of cases;
++ // if not, it would be necessary to call
++ // AttachmentPartImpl.initializeJavaActivationHandlers()
++ // explicitly by programmer
++ initializeJavaActivationHandlers();
+ }
+
+ public AttachmentPartImpl(MIMEPart part) {
+@@ -263,7 +214,7 @@
+ log.log(
+ Level.FINE,
+ "SAAJ0580.soap.set.Content-Type",
+- new String[] { dataHandler.getContentType()});
++ new String[] { dataHandler.getContentType() });
+ setMimeHeader("Content-Type", dataHandler.getContentType());
+ }
+
+@@ -405,7 +356,7 @@
+ throw new SOAPExceptionImpl(e.getLocalizedMessage());
+ } finally {
+ try {
+- decoded.close();
++ decoded.close();
+ } catch (IOException ex) {
+ throw new SOAPException(ex);
+ }
+@@ -608,4 +559,43 @@
+ return headers;
+ }
+
+-}
++ public static void initializeJavaActivationHandlers() {
++ // DataHandler.writeTo() may search for DCH. So adding some default ones.
++ try {
++ CommandMap map = CommandMap.getDefaultCommandMap();
++ if (map instanceof MailcapCommandMap) {
++ MailcapCommandMap mailMap = (MailcapCommandMap) map;
++
++ // registering our DCH since javamail's DCH doesn't handle
++ if (!cmdMapInitialized(mailMap)) {
++ mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
++ mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
++ mailMap.addMailcap("application/fastinfoset;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler");
++ mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");
++ mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler");
++ mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler");
++ }
++ }
++ } catch (Throwable t) {
++ // ignore the exception.
++ }
++ }
++
++ private static boolean cmdMapInitialized(MailcapCommandMap mailMap) {
++
++ // checking fastinfoset handler, since this one is specific to SAAJ
++ CommandInfo[] commands = mailMap.getAllCommands("application/fastinfoset");
++ if (commands == null || commands.length == 0) {
++ return false;
++ }
++
++ String saajClassName = "com.sun.xml.internal.ws.binding.FastInfosetDataContentHandler";
++ for (CommandInfo command : commands) {
++ String commandClass = command.getCommandClass();
++ if (saajClassName.equals(commandClass)) {
++ return true;
++ }
++ }
++ return false;
++ }
++}
+\ No newline at end of file
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.messaging.saaj.soap;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for StaticCache utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2013-09-06 11:24:01.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,7 +25,14 @@
+
+ package com.sun.xml.internal.messaging.saaj.soap;
+
+-import java.util.logging.Logger;
++import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
++import com.sun.xml.internal.messaging.saaj.util.JAXMStreamSource;
++import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
++import com.sun.xml.internal.messaging.saaj.util.ParserPool;
++import com.sun.xml.internal.messaging.saaj.util.RejectDoctypeSaxFilter;
++import com.sun.xml.internal.messaging.saaj.util.transform.EfficientStreamingTransformer;
++import org.xml.sax.InputSource;
++import org.xml.sax.XMLReader;
+
+ import javax.xml.parsers.SAXParser;
+ import javax.xml.soap.SOAPException;
+@@ -34,14 +41,7 @@
+ import javax.xml.transform.dom.DOMResult;
+ import javax.xml.transform.sax.SAXSource;
+ import javax.xml.transform.stream.StreamSource;
+-
+-import org.xml.sax.InputSource;
+-import org.xml.sax.XMLReader;
+-
+-import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
+-import com.sun.xml.internal.messaging.saaj.util.*;
+-
+-import com.sun.xml.internal.messaging.saaj.util.transform.EfficientStreamingTransformer;
++import java.util.logging.Logger;
+
+ /**
+ * EnvelopeFactory creates SOAP Envelope objects using different
+@@ -50,14 +50,19 @@
+ public class EnvelopeFactory {
+
+ protected static final Logger
+- log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
+- "com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
++ log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
++ "com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
+
+- private static ParserPool parserPool = new ParserPool(5);
++ private static ContextClassloaderLocal<ParserPool> parserPool =
++ new ContextClassloaderLocal<ParserPool>() {
++ @Override
++ protected ParserPool initialValue() throws Exception {
++ return new ParserPool(5);
++ }
++ };
+
+ public static Envelope createEnvelope(Source src, SOAPPartImpl soapPart)
+- throws SOAPException
+- {
++ throws SOAPException {
+ // Insert SAX filter to disallow Document Type Declarations since
+ // they are not legal in SOAP
+ SAXParser saxParser = null;
+@@ -73,15 +78,15 @@
+ }
+ }
+ try {
+- saxParser = parserPool.get();
++ saxParser = parserPool.get().get();
+ } catch (Exception e) {
+ log.severe("SAAJ0601.util.newSAXParser.exception");
+ throw new SOAPExceptionImpl(
+- "Couldn't get a SAX parser while constructing a envelope",
+- e);
++ "Couldn't get a SAX parser while constructing a envelope",
++ e);
+ }
+ InputSource is = SAXSource.sourceToInputSource(src);
+- if (is.getEncoding()== null && soapPart.getSourceCharsetEncoding() != null) {
++ if (is.getEncoding() == null && soapPart.getSourceCharsetEncoding() != null) {
+ is.setEncoding(soapPart.getSourceCharsetEncoding());
+ }
+ XMLReader rejectFilter;
+@@ -90,15 +95,15 @@
+ } catch (Exception ex) {
+ log.severe("SAAJ0510.soap.cannot.create.envelope");
+ throw new SOAPExceptionImpl(
+- "Unable to create envelope from given source: ",
+- ex);
++ "Unable to create envelope from given source: ",
++ ex);
+ }
+ src = new SAXSource(rejectFilter, is);
+ }
+
+ try {
+ Transformer transformer =
+- EfficientStreamingTransformer.newTransformer();
++ EfficientStreamingTransformer.newTransformer();
+ DOMResult result = new DOMResult(soapPart);
+ transformer.transform(src, result);
+
+@@ -110,11 +115,11 @@
+ }
+ log.severe("SAAJ0511.soap.cannot.create.envelope");
+ throw new SOAPExceptionImpl(
+- "Unable to create envelope from given source: ",
+- ex);
++ "Unable to create envelope from given source: ",
++ ex);
+ } finally {
+ if (saxParser != null) {
+- parserPool.returnParser(saxParser);
++ parserPool.get().returnParser(saxParser);
+ }
+ }
+ }
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.stream.buffer;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties 2014-04-20 12:39:38.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java 2013-09-06 11:24:03.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java 2014-04-20 12:39:38.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -370,7 +370,12 @@
+ writeTo(handler, errorHandler, isFragment());
+ }
+
+- private static final TransformerFactory trnsformerFactory = TransformerFactory.newInstance();
++ private static final ContextClassloaderLocal<TransformerFactory> trnsformerFactory = new ContextClassloaderLocal<TransformerFactory>() {
++ @Override
++ protected TransformerFactory initialValue() throws Exception {
++ return TransformerFactory.newInstance();
++ }
++ };
+
+ /**
+ * Writes out the contents of this buffer as DOM node and append that to the given node.
+@@ -382,7 +387,7 @@
+ */
+ public final Node writeTo(Node n) throws XMLStreamBufferException {
+ try {
+- Transformer t = trnsformerFactory.newTransformer();
++ Transformer t = trnsformerFactory.get().newTransformer();
+ t.transform(new XMLStreamBufferSource(this), new DOMResult(n));
+ return n.getLastChild();
+ } catch (TransformerException e) {
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2013-09-06 11:24:04.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -14505,7 +17596,7 @@
postInvoke(p,t);
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 2014-04-20 12:39:39.000000000 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14601,8 +17692,384 @@
+ }
+
+}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.api.streaming;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java 2013-09-06 11:24:04.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -61,29 +61,32 @@
+ /**
+ * Singleton instance.
+ */
+- private static volatile @NotNull XMLStreamReaderFactory theInstance;
++ private static volatile ContextClassloaderLocal<XMLStreamReaderFactory> streamReader =
++ new ContextClassloaderLocal<XMLStreamReaderFactory>() {
+
+- static {
+- XMLInputFactory xif = getXMLInputFactory();
+- XMLStreamReaderFactory f=null;
++ @Override
++ protected XMLStreamReaderFactory initialValue() {
++ XMLInputFactory xif = getXMLInputFactory();
++ XMLStreamReaderFactory f=null;
+
+- // this system property can be used to disable the pooling altogether,
+- // in case someone hits an issue with pooling in the production system.
+- if(!getProperty(XMLStreamReaderFactory.class.getName()+".noPool"))
+- f = Zephyr.newInstance(xif);
++ // this system property can be used to disable the pooling altogether,
++ // in case someone hits an issue with pooling in the production system.
++ if(!getProperty(XMLStreamReaderFactory.class.getName()+".noPool"))
++ f = Zephyr.newInstance(xif);
+
+- if(f==null) {
+- // is this Woodstox?
+- if(xif.getClass().getName().equals("com.ctc.wstx.stax.WstxInputFactory"))
+- f = new Woodstox(xif);
+- }
++ if(f==null) {
++ // is this Woodstox?
++ if(xif.getClass().getName().equals("com.ctc.wstx.stax.WstxInputFactory"))
++ f = new Woodstox(xif);
++ }
+
+- if(f==null)
+- f = new Default();
++ if(f==null)
++ f = new Default();
+
+- theInstance = f;
+- LOGGER.fine("XMLStreamReaderFactory instance is = "+theInstance);
+- }
++ LOGGER.fine("XMLStreamReaderFactory instance is = "+f);
++ return f;
++ }
++ };
+
+ private static XMLInputFactory getXMLInputFactory() {
+ XMLInputFactory xif = null;
+@@ -109,11 +112,11 @@
+ */
+ public static void set(XMLStreamReaderFactory f) {
+ if(f==null) throw new IllegalArgumentException();
+- theInstance = f;
++ streamReader.set(f);
+ }
+
+ public static XMLStreamReaderFactory get() {
+- return theInstance;
++ return streamReader.get();
+ }
+
+ public static XMLStreamReader create(InputSource source, boolean rejectDTDs) {
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java 2013-09-06 11:24:04.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -57,39 +57,41 @@
+ /**
+ * Singleton instance.
+ */
+- private static volatile @NotNull XMLStreamWriterFactory theInstance;
++ private static volatile ContextClassloaderLocal<XMLStreamWriterFactory> writerFactory =
++ new ContextClassloaderLocal<XMLStreamWriterFactory>() {
+
+-
+- static {
+- XMLOutputFactory xof = null;
+- if (Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".woodstox")) {
+- try {
+- xof = (XMLOutputFactory)Class.forName("com.ctc.wstx.stax.WstxOutputFactory").newInstance();
+- } catch (Exception e) {
+- // Ignore and fallback to default XMLOutputFactory
++ @Override
++ protected XMLStreamWriterFactory initialValue() {
++ XMLOutputFactory xof = null;
++ if (Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".woodstox")) {
++ try {
++ xof = (XMLOutputFactory)Class.forName("com.ctc.wstx.stax.WstxOutputFactory").newInstance();
++ } catch (Exception e) {
++ // Ignore and fallback to default XMLOutputFactory
++ }
++ }
++ if (xof == null) {
++ xof = XMLOutputFactory.newInstance();
+ }
+- }
+- if (xof == null) {
+- xof = XMLOutputFactory.newInstance();
+- }
+
+- XMLStreamWriterFactory f=null;
++ XMLStreamWriterFactory f=null;
+
+- // this system property can be used to disable the pooling altogether,
+- // in case someone hits an issue with pooling in the production system.
+- if(!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool"))
+- f = Zephyr.newInstance(xof);
+- if(f==null) {
+- // is this Woodstox?
+- if(xof.getClass().getName().equals("com.ctc.wstx.stax.WstxOutputFactory"))
+- f = new NoLock(xof);
+- }
+- if (f == null)
+- f = new Default(xof);
++ // this system property can be used to disable the pooling altogether,
++ // in case someone hits an issue with pooling in the production system.
++ if(!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool"))
++ f = Zephyr.newInstance(xof);
++ if(f==null) {
++ // is this Woodstox?
++ if(xof.getClass().getName().equals("com.ctc.wstx.stax.WstxOutputFactory"))
++ f = new NoLock(xof);
++ }
++ if (f == null)
++ f = new Default(xof);
+
+- theInstance = f;
+- LOGGER.fine("XMLStreamWriterFactory instance is = "+theInstance);
+- }
++ LOGGER.fine("XMLStreamWriterFactory instance is = "+ f);
++ return f;
++ }
++ };
+
+ /**
+ * See {@link #create(OutputStream)} for the contract.
+@@ -152,7 +154,7 @@
+ * Gets the singleton instance.
+ */
+ public static @NotNull XMLStreamWriterFactory get() {
+- return theInstance;
++ return writerFactory.get();
+ }
+
+ /**
+@@ -164,7 +166,7 @@
+ */
+ public static void set(@NotNull XMLStreamWriterFactory f) {
+ if(f==null) throw new IllegalArgumentException();
+- theInstance = f;
++ writerFactory.set(f);
+ }
+
+ /**
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java 2013-09-06 11:24:04.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -36,6 +36,9 @@
+ import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+ import com.sun.xml.internal.ws.developer.BindingTypeFeature;
+
++import javax.activation.CommandInfo;
++import javax.activation.CommandMap;
++import javax.activation.MailcapCommandMap;
+ import javax.xml.ws.Service;
+ import javax.xml.ws.WebServiceFeature;
+ import javax.xml.ws.soap.AddressingFeature;
+@@ -109,9 +112,15 @@
+ return addressingVersion;
+ }
+
+- public final
+ @NotNull
+- Codec createCodec() {
++ public final Codec createCodec() {
++
++ // initialization from here should cover most of cases;
++ // if not, it would be necessary to call
++ // BindingImpl.initializeJavaActivationHandlers()
++ // explicitly by programmer
++ initializeJavaActivationHandlers();
++
+ return bindingId.createEncoder(this);
+ }
+
+@@ -169,4 +178,48 @@
+ public void addFeature(@NotNull WebServiceFeature newFeature) {
+ features.add(newFeature);
+ }
++
++ public static void initializeJavaActivationHandlers() {
++ // DataHandler.writeTo() may search for DCH. So adding some default ones.
++ try {
++ CommandMap map = CommandMap.getDefaultCommandMap();
++ if (map instanceof MailcapCommandMap) {
++ MailcapCommandMap mailMap = (MailcapCommandMap) map;
++
++ // registering our DCH since javamail's DCH doesn't handle
++ if (!cmdMapInitialized(mailMap)) {
++ mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.ws.encoding.XmlDataContentHandler");
++ mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.ws.encoding.XmlDataContentHandler");
++ mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.ws.encoding.ImageDataContentHandler");
++ mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.ws.encoding.StringDataContentHandler");
++ }
++ }
++ } catch (Throwable t) {
++ // ignore the exception.
++ }
++ }
++
++ private static boolean cmdMapInitialized(MailcapCommandMap mailMap) {
++ CommandInfo[] commands = mailMap.getAllCommands("text/xml");
++ if (commands == null || commands.length == 0) {
++ return false;
++ }
++
++ // SAAJ RI implements it's own DataHandlers which can be used for JAX-WS too;
++ // see com.sun.xml.internal.messaging.saaj.soap.AttachmentPartImpl#initializeJavaActivationHandlers
++ // so if found any of SAAJ or our own handler registered, we are ok; anyway using SAAJ directly here
++ // is not good idea since we don't want standalone JAX-WS to depend on specific SAAJ impl.
++ // This is also reason for duplication of Handler's code by JAX-WS
++ String saajClassName = "com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler";
++ String jaxwsClassName = "com.sun.xml.internal.ws.encoding.XmlDataContentHandler";
++ for (CommandInfo command : commands) {
++ String commandClass = command.getCommandClass();
++ if (saajClassName.equals(commandClass) ||
++ jaxwsClassName.equals(commandClass)) {
++ return true;
++ }
++ }
++ return false;
++ }
++
+ }
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 2014-04-20 12:39:39.000000000 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14699,7 +18166,7 @@
+
+}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2013-09-06 11:24:05.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -14774,8 +18241,221 @@
public final Packet doProcess(Packet request, RequestContext rc, ResponseContextReceiver receiver) {
return super.process(request, rc, receiver);
}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.developer;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java 2013-09-06 11:24:05.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -64,7 +64,12 @@
+ @XmlType(name = "EndpointReferenceType", namespace = MemberSubmissionEndpointReference.MSNS)
+ public final class MemberSubmissionEndpointReference extends EndpointReference implements MemberSubmissionAddressingConstants {
+
+- private final static JAXBContext msjc = MemberSubmissionEndpointReference.getMSJaxbContext();
++ private final static ContextClassloaderLocal<JAXBContext> msjc = new ContextClassloaderLocal<JAXBContext>() {
++ @Override
++ protected JAXBContext initialValue() throws Exception {
++ return MemberSubmissionEndpointReference.getMSJaxbContext();
++ }
++ };
+
+ public MemberSubmissionEndpointReference() {
+ }
+@@ -85,7 +90,7 @@
+ throw new WebServiceException("Source parameter can not be null on constructor");
+
+ try {
+- Unmarshaller unmarshaller = MemberSubmissionEndpointReference.msjc.createUnmarshaller();
++ Unmarshaller unmarshaller = MemberSubmissionEndpointReference.msjc.get().createUnmarshaller();
+ MemberSubmissionEndpointReference epr = unmarshaller.unmarshal(source,MemberSubmissionEndpointReference.class).getValue();
+
+ this.addr = epr.addr;
+@@ -104,7 +109,7 @@
+
+ public void writeTo(Result result) {
+ try {
+- Marshaller marshaller = MemberSubmissionEndpointReference.msjc.createMarshaller();
++ Marshaller marshaller = MemberSubmissionEndpointReference.msjc.get().createMarshaller();
+ //marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+ marshaller.marshal(this, result);
+ } catch (JAXBException e) {
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java 2013-09-06 11:24:05.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -34,9 +34,6 @@
+ import com.sun.xml.internal.ws.api.pipe.ContentType;
+ import com.sun.xml.internal.ws.developer.StreamingAttachmentFeature;
+
+-import javax.activation.CommandMap;
+-import javax.activation.MailcapCommandMap;
+-import javax.activation.DataContentHandler;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.OutputStream;
+@@ -62,33 +59,6 @@
+ */
+ abstract class MimeCodec implements Codec {
+
+- static {
+- // DataHandler.writeTo() may search for DCH. So adding some default ones.
+- try {
+- CommandMap map = CommandMap.getDefaultCommandMap();
+- if (map instanceof MailcapCommandMap) {
+- MailcapCommandMap mailMap = (MailcapCommandMap) map;
+- String hndlrStr = ";;x-java-content-handler=";
+- // registering our DCH since javamail's DCH doesn't handle
+- // Source
+- mailMap.addMailcap(
+- "text/xml" + hndlrStr + XmlDataContentHandler.class.getName());
+- mailMap.addMailcap(
+- "application/xml" + hndlrStr + XmlDataContentHandler.class.getName());
+- if (map.createDataContentHandler("image/*") == null) {
+- mailMap.addMailcap(
+- "image/*" + hndlrStr + ImageDataContentHandler.class.getName());
+- }
+- if (map.createDataContentHandler("text/plain") == null) {
+- mailMap.addMailcap(
+- "text/plain" + hndlrStr + StringDataContentHandler.class.getName());
+- }
+- }
+- } catch (Throwable t) {
+- // ignore the exception.
+- }
+- }
+-
+ public static final String MULTIPART_RELATED_MIME_TYPE = "multipart/related";
+
+ private String boundary;
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2013-09-06 11:24:05.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -14842,7 +18522,7 @@
+ }
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2013-09-06 11:24:06.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -14903,7 +18583,7 @@
i++;
}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 2014-04-20 12:39:39.000000000 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -14991,7 +18671,7 @@
+ }
+}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2013-09-06 11:24:06.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2014-01-18 12:16:09.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15009,7 +18689,7 @@
private static final class RuntimeWrapperBeanGenerator extends AbstractWrapperBeanGenerator<java.lang.reflect.Type, Class, java.lang.reflect.Method, Field> {
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 2014-04-20 12:39:39.000000000 -0700
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -15104,7 +18784,7 @@
+
+}
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2013-09-06 11:24:07.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15137,8 +18817,160 @@
return resultClass.cast(result);
} catch (IllegalArgumentException e) {
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.policy.sourcemodel.attach;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -83,7 +83,13 @@
+ private static final QName POLICY = new QName("http://www.w3.org/ns/ws-policy", "Policy");
+ private static final QName URI = new QName("http://www.w3.org/ns/ws-policy", "URI");
+ private static final QName POLICIES = new QName(PolicyConstants.SUN_MANAGEMENT_NAMESPACE, "Policies");
+- private static final XMLInputFactory XML_INPUT_FACTORY = XMLInputFactory.newInstance();
++ private static final ContextClassloaderLocal<XMLInputFactory> XML_INPUT_FACTORY = new ContextClassloaderLocal<XMLInputFactory>() {
++ @Override
++ protected XMLInputFactory initialValue() throws Exception {
++ return XMLInputFactory.newInstance();
++ }
++ };
++
+ private static final PolicyModelUnmarshaller POLICY_UNMARSHALLER = PolicyModelUnmarshaller.getXmlUnmarshaller();
+
+ private final Map<URI, Policy> map = new HashMap<URI, Policy>();
+@@ -93,7 +99,7 @@
+ public static Map<URI, Policy> unmarshal(final Reader source) throws PolicyException {
+ LOGGER.entering(source);
+ try {
+- XMLEventReader reader = XML_INPUT_FACTORY.createXMLEventReader(source);
++ XMLEventReader reader = XML_INPUT_FACTORY.get().createXMLEventReader(source);
+ ExternalAttachmentsUnmarshaller instance = new ExternalAttachmentsUnmarshaller();
+ final Map<URI, Policy> map = instance.unmarshal(reader, null);
+ LOGGER.exiting(map);
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2013-09-06 11:24:07.000000000 -0700
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2014-04-20 12:39:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15156,7 +18988,7 @@
throw new ServerRtException("server.rt.err",e);
} catch (InvocationTargetException e) {
--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800
-+++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 2014-04-20 12:39:39.000000000 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -15252,8 +19084,624 @@
+ }
+
+}
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.spi;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for StaticCache utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java 2013-09-06 11:24:07.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -77,7 +77,12 @@
+ */
+ public class ProviderImpl extends Provider {
+
+- private final static JAXBContext eprjc = getEPRJaxbContext();
++ private final static ContextClassloaderLocal<JAXBContext> eprjc = new ContextClassloaderLocal<JAXBContext>() {
++ @Override
++ protected JAXBContext initialValue() throws Exception {
++ return getEPRJaxbContext();
++ }
++ };
+
+ /**
+ * Convenient singleton instance.
+@@ -140,7 +145,7 @@
+ return AccessController.doPrivileged(new PrivilegedAction<EndpointReference>() {
+ public EndpointReference run() {
+ try {
+- Unmarshaller unmarshaller = eprjc.createUnmarshaller();
++ Unmarshaller unmarshaller = eprjc.get().createUnmarshaller();
+ return (EndpointReference) unmarshaller.unmarshal(eprInfoset);
+ } catch (JAXBException e) {
+ throw new WebServiceException("Error creating Marshaller or marshalling.", e);
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.util.xml;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for StaticCache utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2013-09-06 11:24:08.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -199,20 +199,28 @@
+ }
+ }
+
+- static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+-
+- static final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
++ static final ContextClassloaderLocal<TransformerFactory> transformerFactory = new ContextClassloaderLocal<TransformerFactory>() {
++ @Override
++ protected TransformerFactory initialValue() throws Exception {
++ return TransformerFactory.newInstance();
++ }
++ };
+
+- static {
+- saxParserFactory.setNamespaceAware(true);
+- }
++ static final ContextClassloaderLocal<SAXParserFactory> saxParserFactory = new ContextClassloaderLocal<SAXParserFactory>() {
++ @Override
++ protected SAXParserFactory initialValue() throws Exception {
++ SAXParserFactory factory = SAXParserFactory.newInstance();
++ factory.setNamespaceAware(true);
++ return factory;
++ }
++ };
+
+ /**
+ * Creates a new identity transformer.
+ */
+ public static Transformer newTransformer() {
+ try {
+- return transformerFactory.newTransformer();
++ return transformerFactory.get().newTransformer();
+ } catch (TransformerConfigurationException tex) {
+ throw new IllegalStateException("Unable to create a JAXP transformer");
+ }
+@@ -227,9 +235,9 @@
+ // work around a bug in JAXP in JDK6u4 and earlier where the namespace processing
+ // is not turned on by default
+ StreamSource ssrc = (StreamSource) src;
+- TransformerHandler th = ((SAXTransformerFactory) transformerFactory).newTransformerHandler();
++ TransformerHandler th = ((SAXTransformerFactory) transformerFactory.get()).newTransformerHandler();
+ th.setResult(result);
+- XMLReader reader = saxParserFactory.newSAXParser().getXMLReader();
++ XMLReader reader = saxParserFactory.get().newSAXParser().getXMLReader();
+ reader.setContentHandler(th);
+ reader.setProperty(LEXICAL_HANDLER_PROPERTY, th);
+ reader.parse(toInputSource(ssrc));
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.xsom.util;
++
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.text.MessageFormat;
++import java.util.ResourceBundle;
++import java.util.WeakHashMap;
++
++/**
++ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
++ */
++abstract class ContextClassloaderLocal<V> {
++
++ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
++
++ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
++
++ public V get() throws Error {
++ ClassLoader tccl = getContextClassLoader();
++ V instance = CACHE.get(tccl);
++ if (instance == null) {
++ instance = createNewInstance();
++ CACHE.put(tccl, instance);
++ }
++ return instance;
++ }
++
++ public void set(V instance) {
++ CACHE.put(getContextClassLoader(), instance);
++ }
++
++ protected abstract V initialValue() throws Exception;
++
++ private V createNewInstance() {
++ try {
++ return initialValue();
++ } catch (Exception e) {
++ throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
++ }
++ }
++
++ private static String format(String property, Object... args) {
++ String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
++ return MessageFormat.format(text, args);
++ }
++
++ private static ClassLoader getContextClassLoader() {
++ return (ClassLoader)
++ AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ClassLoader cl = null;
++ try {
++ cl = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException ex) {
++ }
++ return cl;
++ }
++ });
++ }
++}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -0,0 +1,27 @@
++#
++# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# Error messages for ContextClassloaderLocal utility class
++FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0}
++
+--- jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java 2013-09-06 11:24:10.000000000 -0700
++++ jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -60,7 +60,12 @@
+ return new AnnotationParserImpl();
+ }
+
+- private static final SAXTransformerFactory stf = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
++ private static final ContextClassloaderLocal<SAXTransformerFactory> stf = new ContextClassloaderLocal<SAXTransformerFactory>() {
++ @Override
++ protected SAXTransformerFactory initialValue() throws Exception {
++ return (SAXTransformerFactory) SAXTransformerFactory.newInstance();
++ }
++ };
+
+ private static class AnnotationParserImpl extends AnnotationParser {
+
+@@ -72,7 +77,7 @@
+
+ AnnotationParserImpl() {
+ try {
+- transformer = stf.newTransformerHandler();
++ transformer = stf.get().newTransformerHandler();
+ } catch (TransformerConfigurationException e) {
+ throw new Error(e); // impossible
+ }
+--- jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java 2013-09-06 11:24:10.000000000 -0700
++++ jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -27,9 +27,14 @@
+
+ import java.math.BigDecimal;
+ import java.math.BigInteger;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.Calendar;
++import java.util.Collections;
+ import java.util.GregorianCalendar;
++import java.util.Map;
+ import java.util.TimeZone;
++import java.util.WeakHashMap;
+
+ import javax.xml.namespace.QName;
+ import javax.xml.namespace.NamespaceContext;
+@@ -418,7 +423,7 @@
+
+ public static GregorianCalendar _parseDateTime(CharSequence s) {
+ String val = WhiteSpaceProcessor.trim(s).toString();
+- return datatypeFactory.newXMLGregorianCalendar(val).toGregorianCalendar();
++ return getDatatypeFactory().newXMLGregorianCalendar(val).toGregorianCalendar();
+ }
+
+ public String printDateTime(Calendar val) {
+@@ -492,7 +497,7 @@
+ }
+
+ public Calendar parseTime(String lexicalXSDTime) {
+- return datatypeFactory.newXMLGregorianCalendar(lexicalXSDTime).toGregorianCalendar();
++ return getDatatypeFactory().newXMLGregorianCalendar(lexicalXSDTime).toGregorianCalendar();
+ }
+
+ public String printTime(Calendar val) {
+@@ -500,7 +505,7 @@
+ }
+
+ public Calendar parseDate(String lexicalXSDDate) {
+- return datatypeFactory.newXMLGregorianCalendar(lexicalXSDDate).toGregorianCalendar();
++ return getDatatypeFactory().newXMLGregorianCalendar(lexicalXSDDate).toGregorianCalendar();
+ }
+
+ public String printDate(Calendar val) {
+@@ -882,14 +887,30 @@
+ }
+ return false;
+ }
+- private static final DatatypeFactory datatypeFactory;
+
+- static {
+- try {
+- datatypeFactory = DatatypeFactory.newInstance();
+- } catch (DatatypeConfigurationException e) {
+- throw new Error(e);
++ private static final Map<ClassLoader, DatatypeFactory> DF_CACHE = Collections.synchronizedMap(new WeakHashMap<ClassLoader, DatatypeFactory>());
++
++ public static DatatypeFactory getDatatypeFactory() {
++ ClassLoader tccl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
++ public ClassLoader run() {
++ return Thread.currentThread().getContextClassLoader();
++ }
++ });
++ DatatypeFactory df = DF_CACHE.get(tccl);
++ if (df == null) {
++ synchronized (DatatypeConverterImpl.class) {
++ df = DF_CACHE.get(tccl);
++ if (df == null) { // to prevent multiple initialization
++ try {
++ df = DatatypeFactory.newInstance();
++ } catch (DatatypeConfigurationException e) {
++ throw new Error(Messages.format(Messages.FAILED_TO_INITIALE_DATATYPE_FACTORY), e);
++ }
++ DF_CACHE.put(tccl, df);
++ }
++ }
+ }
++ return df;
+ }
+
+ private static final class CalendarFormatter {
+--- jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java 2013-09-06 11:24:10.000000000 -0700
++++ jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -88,4 +88,6 @@
+
+ static final String ILLEGAL_CAST = // 2 args
+ "JAXBContext.IllegalCast";
++
++ static final String FAILED_TO_INITIALE_DATATYPE_FACTORY = "FAILED_TO_INITIALE_DATATYPE_FACTORY";
+ }
+--- jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties 2013-09-06 11:24:10.000000000 -0700
++++ jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -49,3 +49,6 @@
+
+ JAXBContext.IllegalCast = \
+ ClassCastException: attempting to cast {0} to {1}. Please make sure that you are specifying the proper ClassLoader.
++
++FAILED_TO_INITIALE_DATATYPE_FACTORY = \
++ Failed to initialize JAXP 1.3 DatatypeFactory class.
+--- jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2013-09-06 11:24:11.000000000 -0700
++++ jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2014-04-20 12:39:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -69,7 +69,7 @@
+ @XmlType(name="EndpointReferenceType",namespace=W3CEndpointReference.NS)
+ public final class W3CEndpointReference extends EndpointReference {
+
+- private final static JAXBContext w3cjc = getW3CJaxbContext();
++ private final JAXBContext w3cjc = getW3CJaxbContext();
+
+ protected W3CEndpointReference() {
+ }
--- jdk/.hgtags 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/.hgtags 2014-01-18 12:16:33.000000000 -0800
++++ jdk/.hgtags 2014-04-20 12:39:29.000000000 -0700
@@ -123,6 +123,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -15262,7 +19710,7 @@
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -342,3 +343,39 @@
+@@ -342,3 +343,61 @@
b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
@@ -15289,6 +19737,9 @@
+c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
+4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
+8c343a783777b8728cb819938f387db0acf7f3ac jdk7u45-b31
++402d54c7d8ce95f3945cc3d698e528e4adec7b9b jdk7u45-b33
++34e8f9f26ae612ebac36357eecbe70ea20e0233c jdk7u45-b34
++3dbb06a924cdf73d39b8543824ec88ae501ba5c6 jdk7u45-b35
+3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u51-b00
+d76613074ff357d0664b97b4aaf99fbb65dcec47 jdk7u51-b01
+fb057871f094ebe4906ad6856326768b01a62c45 jdk7u51-b02
@@ -15302,8 +19753,27 @@
+4a6e31d94b29c7115235824a6e317289819bb00f jdk7u51-b10
+f0425ecbbb0ca9d8c87c250c19e8f9524b38833d jdk7u51-b11
+f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u51-b12
++d19a89fdfb9b959b8638441d9d396685d6c7ab7b jdk7u51-b13
++ef58b2b9a9a1e1a42b0139b57816a160c4681371 jdk7u51-b30
++5bca0d0969b13b1d9b8caba3cce8293a98d68318 jdk7u51-b31
++f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u55-b00
++5010db5b9b5ab07a9409a5c557d3f43ab32dc428 jdk7u55-b01
++2ca3e1fa4455ad564228ad6e654498167af2f20d jdk7u55-b02
++c12b3c81366cb067ff4444952209d54bfa387353 jdk7u55-b03
++476d1bddaa32bf440953c3b1814ba38f16886c03 jdk7u55-b04
++7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u55-b05
++795654fce29c38d4c8504f760d8d8a36248d38ed jdk7u55-b06
++4b2ed892b195e95f7541aaa3b129a2caa5faae1d jdk7u55-b07
++db1323224053a18ecc62bdc1d3902d93b33f0b70 jdk7u55-b08
++534eeff29ac9fcbbb99ef8908548dbb368d04baf jdk7u55-b09
++d39dd4135844ca5c707bc39ae1d7e020d49880ce jdk7u55-b09
++b231536550067c3b00c77d0e035afe8faaa15581 jdk7u55-b10
++2d80b7cd7aae76f0909a210414317dcf846ad651 jdk7u55-b11
++07be5d5508733ed37c11fcd21a13ae3c8288313b jdk7u55-b12
++92fd166252c2701092a510002f4cf9285a20473d jdk7u55-b13
++4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30
--- jdk/make/bridge/Jabswitch/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/make/bridge/Jabswitch/Makefile 2013-12-01 11:14:27.000000000 -0800
++++ jdk/make/bridge/Jabswitch/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -53,7 +53,7 @@
buildexe :
$(CD) $(TEMPDIR)
@@ -15314,7 +19784,7 @@
copyfilejab :
--- jdk/make/com/sun/jmx/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/make/com/sun/jmx/Makefile 2013-12-01 11:14:27.000000000 -0800
++++ jdk/make/com/sun/jmx/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -15346,7 +19816,7 @@
@$(java-vm-cleanup)
--- jdk/make/com/sun/nio/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/make/com/sun/nio/Makefile 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/nio/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -31,11 +31,18 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -15368,7 +19838,7 @@
all build clean clobber::
$(SUBDIRS-loop)
--- jdk/make/com/sun/nio/sctp/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/make/com/sun/nio/sctp/Makefile 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/nio/sctp/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -59,15 +59,11 @@
-I$(PLATFORM_SRC)/native/java/net \
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
@@ -15388,7 +19858,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
--- jdk/make/com/sun/security/auth/module/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ jdk/make/com/sun/security/auth/module/Makefile 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/security/auth/module/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -15399,7 +19869,7 @@
include FILES_export_unix.gmk
include FILES_c_unix.gmk
--- jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -15410,7 +19880,7 @@
sun/tools/attach/BsdVirtualMachine.java
endif
--- jdk/make/com/sun/tools/attach/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/com/sun/tools/attach/FILES_c.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/tools/attach/FILES_c.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -39,7 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -15421,7 +19891,7 @@
BsdVirtualMachine.c
endif
--- jdk/make/com/sun/tools/attach/FILES_java.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/com/sun/tools/attach/FILES_java.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/tools/attach/FILES_java.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -15432,7 +19902,7 @@
sun/tools/attach/BsdAttachProvider.java
endif
--- jdk/make/com/sun/tools/attach/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/com/sun/tools/attach/Makefile 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/tools/attach/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -38,7 +38,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -15452,7 +19922,7 @@
else
vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
--- jdk/make/com/sun/tools/attach/mapfile-bsd 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/com/sun/tools/attach/mapfile-bsd 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/com/sun/tools/attach/mapfile-bsd 2014-04-20 12:39:22.000000000 -0700
@@ -30,6 +30,7 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -15462,8 +19932,8 @@
Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
Java_sun_tools_attach_BsdVirtualMachine_socket;
--- jdk/make/common/Defs-bsd.gmk 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/make/common/Defs-bsd.gmk 2014-01-18 12:20:58.000000000 -0800
-@@ -0,0 +1,490 @@
++++ jdk/make/common/Defs-bsd.gmk 2014-04-20 12:39:22.000000000 -0700
+@@ -0,0 +1,482 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -15683,14 +20153,6 @@
+ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
+endif
+
-+# If this is a --hash-style=gnu system, use --hash-style=both
-+# The gnu .hash section won't work on some Linux systems like SuSE 10.
-+_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
-+ifneq ($(_HAS_HASH_STYLE_GNU),)
-+ LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
-+endif
-+LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE)
-+
+#
+# Selection of warning messages
+#
@@ -15954,8 +20416,21 @@
+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
+--- jdk/make/common/Defs-embedded.gmk 2013-09-06 11:27:37.000000000 -0700
++++ jdk/make/common/Defs-embedded.gmk 2014-04-20 12:39:22.000000000 -0700
+@@ -71,7 +71,9 @@
+ # and it must be linked after fdlibm - this places it at the end after libc
+ # -z muldefs avoids linker errors for duplicate symbols.
+ ifeq ($(CROSS_COMPILE_ARCH), arm)
+- EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
++ ifneq ($(EXT_LIBS_PATH),)
++ EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
++ endif
+ endif
+ endif
+
--- jdk/make/common/Defs-linux.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Defs-linux.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/common/Defs-linux.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -426,6 +426,7 @@
override LIBDL = -ldl
override MOOT_PRIORITIES = true
@@ -15965,7 +20440,7 @@
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
--- jdk/make/common/Defs-solaris.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Defs-solaris.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/common/Defs-solaris.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -753,6 +753,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -15977,7 +20452,7 @@
LIBSCF = -lscf
--- jdk/make/common/Defs.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Defs.gmk 2014-01-18 12:16:32.000000000 -0800
++++ jdk/make/common/Defs.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -179,15 +179,15 @@
ifdef ALT_FREETYPE_LIB_PATH
@@ -16029,7 +20504,7 @@
else
VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
--- jdk/make/common/Library.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Library.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/Library.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -299,8 +299,12 @@
ifeq ($(PLATFORM), solaris)
$(STRIP) -x $@
@@ -16046,7 +20521,7 @@
# implied else here is no stripping at all
endif
--- jdk/make/common/Mapfile-vers.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Mapfile-vers.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/Mapfile-vers.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -76,7 +76,7 @@
endif # PLATFORM
@@ -16057,7 +20532,7 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
--- jdk/make/common/Program.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Program.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/Program.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -95,23 +95,31 @@
endif # SYSTEM_ZLIB
endif # PLATFORM
@@ -16148,7 +20623,7 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
--- jdk/make/common/Release.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Release.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/Release.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -180,6 +180,12 @@
JA_DIRNAME=ja_JP.UTF-8
endif # linux
@@ -16224,7 +20699,7 @@
fi; \
done
--- jdk/make/common/Rules.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/Rules.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/Rules.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -51,7 +51,7 @@
#
# All source tree areas for java/properties files (a few may be closed)
@@ -16244,7 +20719,7 @@
$(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
@$(add-java-file)
--- jdk/make/common/shared/Compiler-gcc.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/shared/Compiler-gcc.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Compiler-gcc.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -72,6 +72,21 @@
endif
@@ -16268,7 +20743,7 @@
# Settings specific to Solaris
--- jdk/make/common/shared/Defs-bsd.gmk 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/make/common/shared/Defs-bsd.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Defs-bsd.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,267 @@
+#
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -16538,7 +21013,7 @@
+endif
+
--- jdk/make/common/shared/Defs-utils.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/shared/Defs-utils.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Defs-utils.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -74,6 +74,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -16590,7 +21065,7 @@
+ endif
+endif
--- jdk/make/common/shared/Defs-versions.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/shared/Defs-versions.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Defs-versions.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
endif
@@ -16618,7 +21093,7 @@
ifeq ($(PLATFORM), macosx)
REQUIRED_OS_NAME = Darwin
--- jdk/make/common/shared/Defs.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/shared/Defs.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Defs.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -181,7 +181,7 @@
# platform and shared sources/headers. This is mainly useful for the
# Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -16655,7 +21130,7 @@
endif
--- jdk/make/common/shared/Platform.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/common/shared/Platform.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/common/shared/Platform.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -298,6 +298,85 @@
# How much RAM does this machine have:
endif
@@ -16743,7 +21218,7 @@
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
--- jdk/make/java/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -53,14 +53,10 @@
endif
endif # PLATFORM
@@ -16761,7 +21236,7 @@
all build clean clobber::
--- jdk/make/java/instrument/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/instrument/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/instrument/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -104,12 +104,24 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -16792,9 +21267,27 @@
ifeq ($(SYSTEM_ZLIB), true)
OTHER_LDLIBS += -lz
endif
+--- jdk/make/java/java/Exportedfiles.gmk 2013-09-06 11:27:37.000000000 -0700
++++ jdk/make/java/java/Exportedfiles.gmk 2014-04-20 12:39:22.000000000 -0700
+@@ -50,6 +50,7 @@
+ java/lang/SecurityManager.java \
+ java/lang/Shutdown.java \
+ java/lang/Package.java \
++ java/lang/UNIXProcess.java \
+ java/lang/ref/Finalizer.java \
+ java/lang/reflect/AccessibleObject.java \
+ java/lang/reflect/Field.java \
--- jdk/make/java/java/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/java/Makefile 2014-01-18 12:16:33.000000000 -0800
-@@ -175,9 +175,11 @@
++++ jdk/make/java/java/Makefile 2014-04-20 12:39:22.000000000 -0700
+@@ -84,6 +84,7 @@
+ java/util/prefs/FileSystemPreferencesFactory.java \
+
+ FILES_c += UNIXProcess_md.c \
++ childproc.c \
+ UnixFileSystem_md.c \
+ canonicalize_md.c \
+ TimeZone.c \
+@@ -175,9 +176,11 @@
#
ifneq ($(PLATFORM), windows)
ifneq ($(PLATFORM), macosx)
@@ -16806,8 +21299,45 @@
ifeq ($(HAVE_ALTZONE),true)
OTHER_CPPFLAGS += -DHAVE_ALTZONE
+@@ -451,3 +454,36 @@
+ clean::
+ $(RM) $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java
+
++
++HELPER_EXE = $(LIBDIR)/$(LIBARCH)/jspawnhelper
++BUILDHELPER =
++ifeq ($(PLATFORM), solaris)
++ BUILDHELPER = 1
++endif
++ifeq ($(PLATFORM), macosx)
++ HELPER_EXE = $(LIBDIR)/jspawnhelper
++ BUILDHELPER = 1
++endif
++
++ARCHFLAG =
++ifeq ($(ARCH_DATA_MODEL), 64)
++ARCHFLAG = -m64
++endif
++
++ifdef BUILDHELPER
++
++HELPER_EXE_FILES_c = jspawnhelper.c
++HELPER_EXE_FILES_o = $(OBJDIR)/jspawnhelper.o \
++ $(OBJDIR)/childproc.o
++
++$(HELPER_EXE): $(HELPER_EXE_FILES_o)
++ $(CC) $(ARCHFLAG) $(HELPER_EXE_FILES_o) \
++ -o $(TEMPDIR)/jspawnhelper
++ $(CP) $(TEMPDIR)/jspawnhelper $(HELPER_EXE)
++
++build: $(HELPER_EXE)
++
++clean clobber::
++ $(RM) $(HELPER_EXE_FILES_o) $(HELPER_EXE)
++
++endif #BUILDHELPER
--- jdk/make/java/java/genlocales.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/java/genlocales.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/java/genlocales.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -93,18 +93,66 @@
else
@@ -16879,8 +21409,19 @@
genlocales : $(LocaleDataMetaInfo_Dest)
+--- jdk/make/java/java/mapfile-vers 2013-09-06 11:27:37.000000000 -0700
++++ jdk/make/java/java/mapfile-vers 2014-04-20 12:39:22.000000000 -0700
+@@ -215,7 +215,7 @@
+ Java_java_lang_Throwable_fillInStackTrace;
+ Java_java_lang_Throwable_getStackTraceDepth;
+ Java_java_lang_Throwable_getStackTraceElement;
+- Java_java_lang_UNIXProcess_initIDs;
++ Java_java_lang_UNIXProcess_init;
+ Java_java_lang_UNIXProcess_waitForProcessExit;
+ Java_java_lang_UNIXProcess_forkAndExec;
+ Java_java_lang_UNIXProcess_destroyProcess;
--- jdk/make/java/jli/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/jli/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/jli/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -119,9 +119,9 @@
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
endif # PLATFORM
@@ -16903,7 +21444,7 @@
LDLIBS += -lpthread
endif # USE_PTHREADS
--- jdk/make/java/management/mapfile-vers 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/management/mapfile-vers 2013-12-01 11:14:27.000000000 -0800
++++ jdk/make/java/management/mapfile-vers 2014-04-20 12:39:22.000000000 -0700
@@ -53,7 +53,7 @@
Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
Java_sun_management_GcInfoBuilder_getLastGcInfo0;
@@ -16914,7 +21455,7 @@
Java_sun_management_HotspotThread_getInternalThreadTimes0;
Java_sun_management_MemoryImpl_getMemoryManagers0;
--- jdk/make/java/net/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/net/FILES_c.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/net/FILES_c.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -24,20 +24,21 @@
#
@@ -16963,7 +21504,7 @@
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
--- jdk/make/java/net/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/net/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/net/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -83,7 +83,8 @@
# Find platform specific native code
#
@@ -16984,7 +21525,7 @@
OTHER_CFLAGS += -DDONT_ENABLE_IPV6
endif
--- jdk/make/java/net/mapfile-vers 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/net/mapfile-vers 2014-01-18 12:16:22.000000000 -0800
++++ jdk/make/java/net/mapfile-vers 2014-04-20 12:39:22.000000000 -0700
@@ -26,84 +26,86 @@
# Define public interface.
@@ -17150,7 +21691,7 @@
+ *;
};
--- jdk/make/java/nio/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/nio/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/nio/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -263,13 +263,89 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -17292,7 +21833,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
--- jdk/make/java/nio/mapfile-bsd 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/nio/mapfile-bsd 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/nio/mapfile-bsd 2014-04-20 12:39:22.000000000 -0700
@@ -70,6 +70,7 @@
Java_sun_nio_ch_IOUtil_drain;
Java_sun_nio_ch_IOUtil_fdVal;
@@ -17314,7 +21855,7 @@
Java_sun_nio_ch_KQueuePort_interrupt;
Java_sun_nio_ch_KQueuePort_drain1;
--- jdk/make/java/npt/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/npt/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/npt/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -74,6 +74,14 @@
OTHER_LDLIBS += -liconv
endif
@@ -17331,7 +21872,7 @@
# Add to ambient vpath so we pick up the library files
#
--- jdk/make/java/redist/fonts/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ jdk/make/java/redist/fonts/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/java/redist/fonts/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -17360,7 +21901,7 @@
all build : $(INTERNAL_IMPORT_LIST)
--- jdk/make/javax/sound/Makefile 2013-09-06 11:27:38.000000000 -0700
-+++ jdk/make/javax/sound/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/javax/sound/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -111,6 +111,21 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -17384,7 +21925,7 @@
CPPFLAGS += -DUSE_PORTS=TRUE \
-DUSE_DAUDIO=TRUE \
--- jdk/make/javax/sound/SoundDefs.gmk 2013-09-06 11:27:38.000000000 -0700
-+++ jdk/make/javax/sound/SoundDefs.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/javax/sound/SoundDefs.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -17397,7 +21938,7 @@
CPPFLAGS += -DX_PLATFORM=X_MACOSX
endif # PLATFORM macosx
--- jdk/make/javax/sound/jsoundalsa/Makefile 2013-09-06 11:27:38.000000000 -0700
-+++ jdk/make/javax/sound/jsoundalsa/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/javax/sound/jsoundalsa/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -17449,7 +21990,7 @@
#
# Add to the ambient VPATH.
--- jdk/make/jpda/transport/socket/Makefile 2013-09-06 11:27:38.000000000 -0700
-+++ jdk/make/jpda/transport/socket/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/jpda/transport/socket/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -38,6 +38,11 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -17526,7 +22067,7 @@
-FILES_export += \
- com/apple/resources/MacOSXResourceBundle.java
--- jdk/make/sun/awt/Makefile 2013-09-06 11:27:39.000000000 -0700
-+++ jdk/make/sun/awt/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/awt/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -127,7 +127,12 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
endif
@@ -17603,7 +22144,7 @@
endif
--- jdk/make/sun/awt/mawt.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/awt/mawt.gmk 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/awt/mawt.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -17661,7 +22202,7 @@
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include
--- jdk/make/sun/font/Makefile 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/font/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/font/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -36,7 +36,11 @@
CPLUSPLUSLIBRARY=true
@@ -17694,15 +22235,15 @@
OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
ifeq ($(OS_VENDOR),Apple)
--- jdk/make/sun/javazic/tzdata/VERSION 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/VERSION 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/VERSION 2014-04-20 12:39:22.000000000 -0700
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013d
-+tzdata2013h
++tzdata2013i
--- jdk/make/sun/javazic/tzdata/africa 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/africa 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/africa 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17745,7 +22286,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 -
-@@ -490,19 +498,21 @@
+@@ -490,8 +498,8 @@
Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
@@ -17753,16 +22294,10 @@
-Rule Libya 2013 max - Oct lastFri 2:00 0 -
+Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
+Rule Libya 2013 only - Oct lastFri 2:00 0 -
-+
-+# The 1996 and 1997 entries are from Shanks & Pottenger;
-+# the IATA SSIM data contain some obvious errors.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
- 2:00 - EET 1982
- 1:00 Libya CE%sT 1990 May 4
--# The 1996 and 1997 entries are from Shanks & Pottenger;
--# the IATA SSIM data contain some obvious errors.
+@@ -502,7 +510,8 @@
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
@@ -17772,7 +22307,7 @@
# Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -707,15 +717,6 @@
+@@ -707,15 +716,6 @@
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# </a>
@@ -17788,7 +22323,7 @@
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
# and September 1. They originally planned to observe DST to near the end
-@@ -881,13 +882,23 @@
+@@ -881,13 +881,23 @@
# transitions would be 2013-07-07 and 2013-08-10; see:
# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
@@ -17815,7 +22350,7 @@
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
-@@ -902,13 +913,18 @@
+@@ -902,13 +912,18 @@
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
#
@@ -17841,7 +22376,7 @@
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-@@ -935,12 +951,14 @@
+@@ -935,12 +950,14 @@
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00 S
Rule Morocco 2011 only - Jul 31 0 0 -
@@ -17858,7 +22393,7 @@
Rule Morocco 2014 only - Jun 29 3:00 0 -
Rule Morocco 2014 only - Jul 29 2:00 1:00 S
Rule Morocco 2015 only - Jun 18 3:00 0 -
-@@ -953,20 +971,42 @@
+@@ -953,20 +970,42 @@
Rule Morocco 2018 only - Jun 15 2:00 1:00 S
Rule Morocco 2019 only - May 6 3:00 0 -
Rule Morocco 2019 only - Jun 5 2:00 1:00 S
@@ -17903,7 +22438,7 @@
# Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -1123,9 +1163,7 @@
+@@ -1123,9 +1162,7 @@
3:00 - EAT
# South Sudan
@@ -17915,7 +22450,7 @@
# Swaziland
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--- jdk/make/sun/javazic/tzdata/antarctica 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/antarctica 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/antarctica 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18008,7 +22543,7 @@
-Link Antarctica/McMurdo Antarctica/South_Pole
+# See 'australasia' for Antarctica/McMurdo.
--- jdk/make/sun/javazic/tzdata/asia 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/asia 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/asia 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18139,22 +22674,34 @@
# Iran
-@@ -1387,9 +1404,11 @@
+@@ -1386,10 +1403,22 @@
+ # switch back to standard time this winter, so the will stay on DST
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
- #
+-#
-# From Paul Eggert (2012-10-25):
-# For now, assume this is just a one-year measure. If it becomes
-# permanent, we should move Jordan from EET to AST effective tomorrow.
-+# From Paul Eggert (2013-09-21):
-+# It's looking like this change will be permanent; see
-+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
-+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
-+# So move Jordan to UTC+3 as of the abovementioned date.
++
++# From Steffen Thorsen (2013-12-11):
++# Jordan Times and other sources say that Jordan is going back to
++# UTC+2 on 2013-12-19 at midnight:
++# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime
++# Official, in Arabic:
++# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
++# ... Our background/permalink about it
++# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
++# ...
++# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
++# ... says midnight for the coming one and 1:00 for the ones in the future
++# (and they will use DST again next year, using the normal schedule).
++
++# From Paul Eggert (2013-12-11):
++# As Steffen suggested, consider the past 21-month experiment to be DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
-@@ -1415,15 +1434,15 @@
+@@ -1415,12 +1444,14 @@
Rule Jordan 1999 only - Jul 1 0:00s 1:00 S
Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 -
Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S
@@ -18163,18 +22710,15 @@
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
--Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
+ Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
-Rule Jordan 2013 max - Oct lastFri 0:00s 0 -
-+Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
++Rule Jordan 2013 only - Dec 20 0:00 0 -
++Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S
++Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
-- 2:00 Jordan EE%sT
-+ 2:00 Jordan EE%sT 2012 Oct 26 0:00s
-+ 3:00 - AST
-
-
- # Kazakhstan
-@@ -2303,9 +2322,18 @@
+ 2:00 Jordan EE%sT
+@@ -2303,9 +2334,18 @@
# http://www.samanews.com/index.php?act=Show&id=154120
# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
@@ -18195,7 +22739,7 @@
# the predictions in today's editions of the following URLs,
# which are for Gaza and Hebron respectively:
# http://www.timeanddate.com/worldclock/timezone.html?n=702
-@@ -2336,7 +2364,8 @@
+@@ -2336,7 +2376,8 @@
Rule Palestine 2011 only - Aug 30 0:00 1:00 S
Rule Palestine 2011 only - Sep 30 0:00 0 -
Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S
@@ -18206,7 +22750,7 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
--- jdk/make/sun/javazic/tzdata/australasia 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/australasia 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/australasia 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18302,7 +22846,7 @@
# Kingman
# uninhabited
--- jdk/make/sun/javazic/tzdata/backward 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/backward 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/backward 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18365,7 +22909,7 @@
Link Europe/Lisbon Portugal
Link Asia/Taipei ROC
--- jdk/make/sun/javazic/tzdata/etcetera 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/etcetera 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/etcetera 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18406,7 +22950,7 @@
# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
--- jdk/make/sun/javazic/tzdata/europe 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/europe 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/europe 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18761,7 +23305,7 @@
# One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
--- jdk/make/sun/javazic/tzdata/factory 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/factory 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/factory 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18790,7 +23334,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/iso3166.tab 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/iso3166.tab 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/iso3166.tab 2014-04-20 12:39:22.000000000 -0700
@@ -1,30 +1,30 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18856,7 +23400,7 @@
BS Bahamas
BT Bhutan
--- jdk/make/sun/javazic/tzdata/leapseconds 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/leapseconds 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/leapseconds 2014-04-20 12:39:22.000000000 -0700
@@ -1,37 +1,43 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18976,7 +23520,7 @@
-# Earth Orientation Center of IERS
-# Observatoire de Paris, France
--- jdk/make/sun/javazic/tzdata/northamerica 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/northamerica 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/northamerica 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19225,7 +23769,29 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
-5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time
-@@ -2892,9 +2894,7 @@
+@@ -2686,6 +2688,11 @@
+ # to DST--and one more hour on 1999-04-04--when the announcers will have
+ # returned to Baltimore, which switches on that date.)
+
++# From Steffen Thorsen (2013-11-11):
++# DST start in Cuba in 2004 ... does not follow the same rules as the
++# years before. The correct date should be Sunday 2004-03-28 00:00 ...
++# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html
++
+ # From Evert van der Veer via Steffen Thorsen (2004-10-28):
+ # Cuba is not going back to standard time this year.
+ # From Paul Eggert (2006-03-22):
+@@ -2875,7 +2882,8 @@
+ Rule Cuba 1997 only - Oct 12 0:00s 0 S
+ Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
+ Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
+-Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
++Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D
++Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D
+ Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
+ Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
+ Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D
+@@ -2892,9 +2900,7 @@
-5:00 Cuba C%sT
# Dominica
@@ -19236,7 +23802,7 @@
# Dominican Republic
-@@ -2943,18 +2943,10 @@
+@@ -2943,18 +2949,10 @@
-6:00 Salv C%sT
# Grenada
@@ -19256,7 +23822,7 @@
# Guatemala
#
-@@ -3097,17 +3089,12 @@
+@@ -3097,17 +3095,12 @@
# Great Swan I ceded by US to Honduras in 1972
# Jamaica
@@ -19279,7 +23845,7 @@
-5:00 - EST 1974 Apr 28 2:00
-5:00 US E%sT 1984
-5:00 - EST
-@@ -3121,12 +3108,7 @@
+@@ -3121,12 +3114,7 @@
-4:00 - AST
# Montserrat
@@ -19293,7 +23859,7 @@
# Nicaragua
#
-@@ -3200,7 +3182,7 @@
+@@ -3200,7 +3188,7 @@
-5:00 - EST
# Puerto Rico
@@ -19302,7 +23868,7 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
-@@ -3208,18 +3190,11 @@
+@@ -3208,18 +3196,11 @@
-4:00 - AST
# St Kitts-Nevis
@@ -19323,7 +23889,7 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
-4:00 - AST 1980 May
-@@ -3227,10 +3202,7 @@
+@@ -3227,10 +3208,7 @@
-3:00 Canada PM%sT
# St Vincent and the Grenadines
@@ -19335,7 +23901,7 @@
# Turks and Caicos
#
-@@ -3260,15 +3232,9 @@
+@@ -3260,15 +3238,9 @@
Rule TC 2007 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
@@ -19354,7 +23920,7 @@
- -4:00 - AST
+# See 'southamerica'.
--- jdk/make/sun/javazic/tzdata/pacificnew 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/pacificnew 2014-01-18 12:16:25.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/pacificnew 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19383,7 +23949,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/solar87 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/solar87 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/solar87 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19412,7 +23978,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/solar88 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/solar88 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/solar88 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19441,7 +24007,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/solar89 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/solar89 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/solar89 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19470,7 +24036,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/southamerica 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/southamerica 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/southamerica 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19660,7 +24226,7 @@
Rule Uruguay 1942 only - Jan 1 0:00 0 -
Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
--- jdk/make/sun/javazic/tzdata/systemv 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/systemv 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/systemv 2014-04-20 12:39:22.000000000 -0700
@@ -1,22 +1,22 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19689,7 +24255,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
--- jdk/make/sun/javazic/tzdata/zone.tab 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/javazic/tzdata/zone.tab 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/javazic/tzdata/zone.tab 2014-04-20 12:39:22.000000000 -0700
@@ -1,53 +1,55 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19801,7 +24367,7 @@
US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
--- jdk/make/sun/jawt/Makefile 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/jawt/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/jawt/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -99,8 +99,7 @@
#
# Other extra flags needed for compiling.
@@ -19830,7 +24396,7 @@
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
else
--- jdk/make/sun/net/FILES_java.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/net/FILES_java.gmk 2014-01-18 12:16:26.000000000 -0800
++++ jdk/make/sun/net/FILES_java.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -24,122 +24,123 @@
#
@@ -20070,7 +24636,7 @@
FILES_java += sun/net/sdp/SdpProvider.java
endif
--- jdk/make/sun/nio/cs/FILES_java.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/nio/cs/FILES_java.gmk 2013-12-01 11:14:29.000000000 -0800
++++ jdk/make/sun/nio/cs/FILES_java.gmk 2014-04-20 12:39:22.000000000 -0700
@@ -329,6 +329,7 @@
sun/nio/cs/ext/IBM280.java \
sun/nio/cs/ext/IBM284.java \
@@ -20080,7 +24646,7 @@
sun/nio/cs/ext/IBM420.java \
sun/nio/cs/ext/IBM424.java \
--- jdk/make/sun/rmi/rmi/Makefile 2013-09-06 11:27:40.000000000 -0700
-+++ jdk/make/sun/rmi/rmi/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/rmi/rmi/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -71,6 +71,9 @@
BUILD_TARGETS += bin
endif
@@ -20092,7 +24658,7 @@
build: $(BUILD_TARGETS)
--- jdk/make/sun/splashscreen/Makefile 2013-09-06 11:27:41.000000000 -0700
-+++ jdk/make/sun/splashscreen/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/splashscreen/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -83,15 +83,16 @@
-framework JavaNativeFoundation
else ifneq ($(PLATFORM), windows)
@@ -20119,7 +24685,7 @@
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
--- jdk/make/sun/xawt/Makefile 2013-09-06 11:27:41.000000000 -0700
-+++ jdk/make/sun/xawt/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/sun/xawt/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -52,6 +52,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -20173,7 +24739,7 @@
CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
endif
--- jdk/make/tools/CharsetMapping/IBM290.c2b 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/make/tools/CharsetMapping/IBM290.c2b 2013-12-01 11:14:30.000000000 -0800
++++ jdk/make/tools/CharsetMapping/IBM290.c2b 2014-04-20 12:39:23.000000000 -0700
@@ -0,0 +1,100 @@
+#
+# Diff of
@@ -20276,7 +24842,7 @@
+0xF8 U+FF18
+0xF9 U+FF19
--- jdk/make/tools/CharsetMapping/IBM290.map 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/make/tools/CharsetMapping/IBM290.map 2013-12-01 11:14:30.000000000 -0800
++++ jdk/make/tools/CharsetMapping/IBM290.map 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,232 @@
+#
+# b2c mapping for IBM290, generated from
@@ -20511,7 +25077,7 @@
+0xF9 U+0039
+0xFF U+009F
--- jdk/make/tools/CharsetMapping/extsbcs 2013-09-06 11:27:42.000000000 -0700
-+++ jdk/make/tools/CharsetMapping/extsbcs 2013-12-01 11:14:30.000000000 -0800
++++ jdk/make/tools/CharsetMapping/extsbcs 2014-04-20 12:39:23.000000000 -0700
@@ -28,6 +28,7 @@
IBM280 IBM280 Cp280 false sun.nio.cs.ext
IBM284 IBM284 Cp284 false sun.nio.cs.ext
@@ -20521,7 +25087,7 @@
IBM420 IBM420 Cp420 false sun.nio.cs.ext
IBM424 IBM424 Cp424 false sun.nio.cs.ext
--- jdk/make/tools/freetypecheck/Makefile 2013-09-06 11:27:43.000000000 -0700
-+++ jdk/make/tools/freetypecheck/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/tools/freetypecheck/Makefile 2014-04-20 12:39:22.000000000 -0700
@@ -52,8 +52,15 @@
else
ifeq ($(PLATFORM), macosx)
@@ -20541,7 +25107,7 @@
endif
endif
--- jdk/make/tools/sharing/classlist.bsd 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/make/tools/sharing/classlist.bsd 2014-01-18 12:16:33.000000000 -0800
++++ jdk/make/tools/sharing/classlist.bsd 2014-04-20 12:39:23.000000000 -0700
@@ -0,0 +1,2327 @@
+java/lang/Object
+java/lang/String
@@ -22870,20496 +27436,8 @@
+sun/applet/AppletPanel$6
+javax/swing/BufferStrategyPaintManager$1
+# f3ac8b467e7f8c49
---- jdk/src/bsd/doc/man/appletviewer.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/appletviewer.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH appletviewer 1 "10 May 2011"
-+.TH appletviewer 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -36,11 +36,14 @@
- .SH "DESCRIPTION"
- .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
-+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://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
-+http://docs.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
-+.LP
-+.LP
-+\f3Note:\fP The \f3appletviewer\fP is intended for development purposes only. See About Sample / Test Applications and Code for more information.
- .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.
-@@ -49,18 +52,18 @@
- .LP
- .RS 3
- .TP 3
--\-debug
--Starts the applet viewer in the Java debugger, jdb(1), thus allowing you to debug the applets in the document.
-+\-debug
-+Starts the applet viewer in the Java debugger, jdb(1), thus allowing you to debug the applets in the document.
- .TP 3
--\-encoding \ \ encoding name
--Specify the input HTML file encoding name.
-+\-encoding \ \ encoding name
-+Specify the input HTML file encoding name.
- .TP 3
--\-Jjavaoption
--Passes through the string \f2javaoption\fP as a single argument to the Java interpreter which runs the appletviewer. The argument should not contain spaces. Multiple argument words must all begin with the prefix \f3\-J\fP, which is stripped. This is useful for adjusting the compiler's execution environment or memory usage.
-+\-Jjavaoption
-+Passes through the string \f2javaoption\fP as a single argument to the Java interpreter which runs the appletviewer. The argument should not contain spaces. Multiple argument words must all begin with the prefix \f3\-J\fP, which is stripped. This is useful for adjusting the compiler's execution environment or memory usage.
- .RE
-
- .LP
- .LP
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/apt.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/apt.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH apt 1 "10 May 2011"
-+.TH apt 1 "16 Mar 2012"
-
- .LP
- .SH "NAME"
-@@ -39,11 +39,11 @@
- .LP
- .RS 3
- .TP 3
--sourcefiles
--Zero or more source files to be processed.
-+sourcefiles
-+Zero or more source files to be processed.
- .TP 3
--@files
--One or more files that list source files or other options
-+@files
-+One or more files that list source files or other options
- .RE
-
- .LP
-@@ -56,80 +56,80 @@
- 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
-+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://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
- .LP
- .SH "OPTIONS"
- .LP
--.SS
-+.SS
- apt specific options
- .LP
- .RS 3
- .TP 3
--\-s dir
--Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace.
-+\-s dir
-+Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace.
- .TP 3
--\-nocompile
--Do not compile source files to class files.
-+\-nocompile
-+Do not compile source files to class files.
- .TP 3
--\-print
--Print out textual representation of specified types; perform no annotation processing or compilation.
-+\-print
-+Print out textual representation of specified types; perform no annotation processing or compilation.
- .TP 3
--\-A[key[=val]]
--Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors
-+\-A[key[=val]]
-+Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors
- .TP 3
--\-factorypath path
--Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories.
-+\-factorypath path
-+Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories.
- .TP 3
--\-factory classname
--Name of annotation processor factory to use; bypasses default discovery process
-+\-factory classname
-+Name of annotation processor factory to use; bypasses default discovery process
- .TP 3
--\-version
--Print version information.
-+\-version
-+Print version information.
- .TP 3
--\-X
--Display information about non\-standard options.
-+\-X
-+Display information about non\-standard options.
- .RE
-
- .LP
--.SS
-+.SS
- Options shared with javac
- .LP
- .RS 3
- .TP 3
--\-d dir
--Specify where to place processor and javac generated class files
-+\-d dir
-+Specify where to place processor and javac generated class files
- .TP 3
--\-cp path or \-classpath path
--Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories.
-+\-cp path or \-classpath path
-+Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories.
- .RE
-
- .LP
- .LP
- Consult the javac(1) man page for information on \f2javac\fP options.
- .LP
--.SS
-+.SS
- Non\-Standard Options
- .LP
- .RS 3
- .TP 3
--\-XListAnnotationTypes
--List found annotation types.
-+\-XListAnnotationTypes
-+List found annotation types.
- .TP 3
--\-XListDeclarations
--List specified and included declarations.
-+\-XListDeclarations
-+List specified and included declarations.
- .TP 3
--\-XPrintAptRounds
--Print information about initial and recursive \f2apt\fP rounds.
-+\-XPrintAptRounds
-+Print information about initial and recursive \f2apt\fP rounds.
- .TP 3
--\-XPrintFactoryInfo
--Print information about which annotations a factory is asked to process.
-+\-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.
-+\-XclassesAsDecls
-+Treat both class and source files as declarations to process.
- .RE
-
- .LP
-@@ -146,8 +146,8 @@
- .RS 3
- .TP 2
- o
--javac(1), java(1)
-+javac(1), java(1)
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/extcheck.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/extcheck.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH extcheck 1 "10 May 2011"
-+.TH extcheck 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -57,11 +57,11 @@
- .LP
- .RS 3
- .TP 3
--\-verbose
--Lists Jar files in the extension directory as they are checked. Additionally, manifest attributes of the target jar file and any conflicting jar files are also reported.
-+\-verbose
-+Lists Jar files in the extension directory as they are checked. Additionally, manifest attributes of the target jar file and any conflicting jar files are also reported.
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
- .RE
-
- .LP
-@@ -70,4 +70,4 @@
- .LP
- jar(1)
- .LP
--
-+
---- jdk/src/bsd/doc/man/idlj.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/idlj.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,13 +19,13 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH idlj 1 "10 May 2011"
-+.TH idlj 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- idlj \- The IDL\-to\-Java Compiler
- .LP
--\f3idlj\fP generates Java bindings from a given IDL file.
-+\f3idlj\fP generates Java bindings from a given IDL file.
- .SH "Synopsis"
- .LP
- .nf
-@@ -43,13 +43,13 @@
- .SH "Description"
- .LP
- .LP
--The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the
-+The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the
- .na
- \f2OMG IDL to Java Language Language Mapping Specification\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
- .LP
--.SS
-+.SS
- Emitting Client and Server Bindings
- .LP
- .LP
-@@ -106,18 +106,18 @@
- The default server\-side model is the \f2Portable Servant Inheritance Model\fP. Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2MyPOA.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2MyPOA\fP.
- .LP
- .LP
--\f2MyPOA.java\fP is a stream\-based skeleton that extends
-+\f2MyPOA.java\fP is a stream\-based skeleton that extends
- .na
- \f2org.omg.PortableServer.Servant\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
-+http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
- .LP
- .LP
--The \f2PortableServer\fP module for the
-+The \f2PortableServer\fP module for the
- .na
- \f2Portable Object Adapter (POA)\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
- .LP
- .LP
- Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible:
-@@ -170,7 +170,7 @@
- .fl
- MyServant myDelegate = new MyServant();
- .fl
-- myDelegate.setORB(orb);
-+ myDelegate.setORB(orb);
- .fl
-
- .fl
-@@ -218,7 +218,7 @@
- .fl
- MyServant myDelegate = new MyServant();
- .fl
-- myDelegate.setORB(orb);
-+ myDelegate.setORB(orb);
- .fl
-
- .fl
-@@ -236,7 +236,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Specifying Alternate Locations for Emitted Files
- .LP
- .LP
-@@ -253,7 +253,7 @@
- .LP
- For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP.
- .LP
--.SS
-+.SS
- Specifying Alternate Locations for Include Files
- .LP
- .LP
-@@ -291,13 +291,13 @@
-
- .LP
- .LP
--The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the
-+The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the
- .na
- \f2Setting the Classpath\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general.
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general.
- .LP
--.SS
-+.SS
- Emitting Bindings for Include Files
- .LP
- .LP
-@@ -469,7 +469,7 @@
- .LP
- If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted.
- .LP
--.SS
-+.SS
- Inserting Package Prefixes
- .LP
- .LP
-@@ -525,7 +525,7 @@
- .fi
-
- .LP
--So the line for the above example would be:
-+So the line for the above example would be:
- .nf
- \f3
- .fl
-@@ -538,7 +538,7 @@
- .LP
- The use of this option does not affect the Repository ID.
- .LP
--.SS
-+.SS
- Defining Symbols Before Compilation
- .LP
- .LP
-@@ -555,7 +555,7 @@
- .LP
- is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP.
- .LP
--.SS
-+.SS
- Preserving Pre\-Existing Bindings
- .LP
- .LP
-@@ -572,7 +572,7 @@
- .LP
- emits all client\-side bindings that do not already exist.
- .LP
--.SS
-+.SS
- Viewing Progress of Compilation
- .LP
- .LP
-@@ -589,7 +589,7 @@
- .LP
- By default the compiler does not operate in verbose mode.
- .LP
--.SS
-+.SS
- Displaying Version Information
- .LP
- .LP
-@@ -611,8 +611,8 @@
- .LP
- .RS 3
- .TP 3
--\-d symbol
--This is equivalent to the following line in an IDL file:
-+\-d symbol
-+This is equivalent to the following line in an IDL file:
- .nf
- \f3
- .fl
-@@ -621,32 +621,32 @@
- \fP
- .fi
- .TP 3
--\-emitAll
--Emit all types, including those found in \f2#include\fP files.
-+\-emitAll
-+Emit all types, including those found in \f2#include\fP files.
- .TP 3
--\-fside
--Defines what bindings to emit. \f2side\fP is one of \f2client\fP, \f2server\fP, \f2serverTIE\fP, \f2all\fP, or \f2allTIE\fP. The \f2\-fserverTIE\fP and \f2\-fallTIE\fP options cause delegate model skeletons to be emitted. Assumes \f2\-fclient\fP if the flag is not specified.
-+\-fside
-+Defines what bindings to emit. \f2side\fP is one of \f2client\fP, \f2server\fP, \f2serverTIE\fP, \f2all\fP, or \f2allTIE\fP. The \f2\-fserverTIE\fP and \f2\-fallTIE\fP options cause delegate model skeletons to be emitted. Assumes \f2\-fclient\fP if the flag is not specified.
- .TP 3
--\-i include\-path
--By default, the current directory is scanned for included files. This option adds another directory.
-+\-i include\-path
-+By default, the current directory is scanned for included files. This option adds another directory.
- .TP 3
--\-keep
--If a file to be generated already exists, do not overwrite it. By default it is overwritten.
-+\-keep
-+If a file to be generated already exists, do not overwrite it. By default it is overwritten.
- .TP 3
--\-noWarn
--Suppresses warning messages.
-+\-noWarn
-+Suppresses warning messages.
- .TP 3
--\-oldImplBase
--Generates skeletons compatible with pre\-1.4 JDK ORBs. By default, the POA Inheritance Model server\-side bindings are generated. This option provides backward\-compatibility with older versions of the Java programming language by generating server\-side bindings that are \f2ImplBase\fP Inheritance Model classes.
-+\-oldImplBase
-+Generates skeletons compatible with pre\-1.4 JDK ORBs. By default, the POA Inheritance Model server\-side bindings are generated. This option provides backward\-compatibility with older versions of the Java programming language by generating server\-side bindings that are \f2ImplBase\fP Inheritance Model classes.
- .TP 3
--\-pkgPrefix type prefix
--Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
-+\-pkgPrefix type prefix
-+Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
- .TP 3
--\-pkgTranslate type package
-+\-pkgTranslate type package
- Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
- .br
- .br
--If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include:
-+If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include:
- .nf
- \f3
- .fl
-@@ -654,7 +654,7 @@
- .fl
- \fP
- .fi
--The following translations would occur:
-+The following translations would occur:
- .nf
- \f3
- .fl
-@@ -668,47 +668,47 @@
- .fl
- \fP
- .fi
--The following package names cannot be translated:
-+The following package names cannot be translated:
- .RS 3
- .TP 2
- o
--\f2org\fP
-+\f2org\fP
- .TP 2
- o
--\f2org.omg\fP or any subpackages of \f2org.omg\fP
-+\f2org.omg\fP or any subpackages of \f2org.omg\fP
- .RE
--Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
-+Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
- .TP 3
--\-skeletonName xxx%yyy
--Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are:
-+\-skeletonName xxx%yyy
-+Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are:
- .RS 3
- .TP 2
- o
--%POA for the \f2POA\fP base class (\f2\-fserver\fP or \f2\-fall\fP)
-+%POA for the \f2POA\fP base class (\f2\-fserver\fP or \f2\-fall\fP)
- .TP 2
- o
--_%ImplBase for the \f2oldImplBase\fP class (\f2\-oldImplBase\fP and (\f2\-fserver\fP or \f2\-fall\fP))
-+_%ImplBase for the \f2oldImplBase\fP class (\f2\-oldImplBase\fP and (\f2\-fserver\fP or \f2\-fall\fP))
- .RE
- .TP 3
--\-td dir
--Use \f2dir\fP for the output directory instead of the current directory.
-+\-td dir
-+Use \f2dir\fP for the output directory instead of the current directory.
- .TP 3
--\-tieName xxx%yyy
--Name the tie according to the pattern. The defaults are:
-+\-tieName xxx%yyy
-+Name the tie according to the pattern. The defaults are:
- .RS 3
- .TP 2
- o
--%POATie for the \f2POA\fP tie base class (\f2\-fserverTie\fP or \f2\-fallTie\fP)
-+%POATie for the \f2POA\fP tie base class (\f2\-fserverTie\fP or \f2\-fallTie\fP)
- .TP 2
- o
--%_Tie for the \f2oldImplBase\fP tie class (\f2\-oldImplBase\fP and (\f2\-fserverTie\fP or \f2\-fallTie\fP))
-+%_Tie for the \f2oldImplBase\fP tie class (\f2\-oldImplBase\fP and (\f2\-fserverTie\fP or \f2\-fallTie\fP))
- .RE
- .TP 3
--\-nowarn, \-verbose
--Verbose mode.
-+\-nowarn, \-verbose
-+Verbose mode.
- .TP 3
--\-version
--Display version information and terminate.
-+\-version
-+Display version information and terminate.
- .RE
-
- .LP
-@@ -720,10 +720,10 @@
- .RS 3
- .TP 2
- o
--Escaped identifiers in the global scope may not have the same spelling as IDL primitive types, \f2Object\fP, or \f2ValueBase\fP. This is because the symbol table is pre\-loaded with these identifiers; allowing them to be redefined would overwrite their original definitions. (Possible permanent restriction).
-+Escaped identifiers in the global scope may not have the same spelling as IDL primitive types, \f2Object\fP, or \f2ValueBase\fP. This is because the symbol table is pre\-loaded with these identifiers; allowing them to be redefined would overwrite their original definitions. (Possible permanent restriction).
- .TP 2
- o
--The \f2fixed\fP IDL type is not supported.
-+The \f2fixed\fP IDL type is not supported.
- .RE
-
- .LP
-@@ -732,8 +732,8 @@
- .RS 3
- .TP 2
- o
--No import generated for global identifiers. If you invoke on an unexported local impl, you do get an exception, but it seems to be due to a \f2NullPointerException\fP in the \f2ServerDelegate\fP DSI code.
-+No import generated for global identifiers. If you invoke on an unexported local impl, you do get an exception, but it seems to be due to a \f2NullPointerException\fP in the \f2ServerDelegate\fP DSI code.
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jar.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jar.1 2014-01-18 12:16:32.000000000 -0800
-@@ -19,31 +19,31 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jar 1 "10 May 2011"
-+.TH jar 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- jar\-The Java Archive Tool
- .LP
--\f3jar\fP combines multiple files into a single JAR archive file.
-+\f3jar\fP combines multiple files into a single JAR archive file.
- .SH "SYNOPSIS"
- .LP
- .RS 3
- .TP 3
--Create jar file
--\f4jar c\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
-+Create jar file
-+\f4jar c\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
- .TP 3
--Update jar file
--\f4jar u\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
-+Update jar file
-+\f4jar u\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
- .TP 3
--Extract jar file
--\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
-+Extract jar file
-+\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
- .TP 3
--List table of contents of jar file
--\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
-+List table of contents of jar file
-+\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
- .TP 3
--Add index to jar file
--\f4jar i\fP \f2jarfile\fP \f2[\-J\fP\f2option\fP\f2]\fP
-+Add index to jar file
-+\f4jar i\fP \f2jarfile\fP \f2[\-J\fP\f2option\fP\f2]\fP
- .RE
-
- .LP
-@@ -52,36 +52,36 @@
- .LP
- .RS 3
- .TP 3
--cuxtiv0Mmfe
--Options that control the \f2jar\fP command.
-+cuxtiv0Mmfe
-+Options that control the \f2jar\fP command.
- .TP 3
--jarfile
--Jar file to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), or have its table of contents viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if either is present, they must both appear. Note that omitting \f2f\fP and \f2jarfile\fP accepts a "jar file" from standard input (for x and t) or sends the "jar file" to standard output (for c and u).
-+jarfile
-+Jar file to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), or have its table of contents viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if either is present, they must both appear. Note that omitting \f2f\fP and \f2jarfile\fP accepts a "jar file" from standard input (for x and t) or sends the "jar file" to standard output (for c and u).
- .TP 3
--inputfiles
--Files or directories, separated by spaces, to be combined into \f2jarfile\fP (for c and u), or to be extracted (for x) or listed (for t) from \f2jarfile\fP. All directories are processed recursively. The files are compressed unless option \f20\fP (zero) is used.
-+inputfiles
-+Files or directories, separated by spaces, to be combined into \f2jarfile\fP (for c and u), or to be extracted (for x) or listed (for t) from \f2jarfile\fP. All directories are processed recursively. The files are compressed unless option \f20\fP (zero) is used.
- .TP 3
--manifest
--Pre\-existing manifest file whose \f2name\fP\f2:\fP \f2value\fP pairs are to be included in MANIFEST.MF in the jar file. The \f2\-m\fP option and filename \f2manifest\fP are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
-+manifest
-+Pre\-existing manifest file whose \f2name\fP\f2:\fP \f2value\fP pairs are to be included in MANIFEST.MF in the jar file. The \f2\-m\fP option and filename \f2manifest\fP are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
- .TP 3
--entrypoint
--The name of the class that set as the application entry point for stand\-alone applications bundled into executable jar file. The \f2\-e\fP option and entrypoint are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
-+entrypoint
-+The name of the class that set as the application entry point for stand\-alone applications bundled into executable jar file. The \f2\-e\fP option and entrypoint are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
- .TP 3
--\-C\ dir
--Temporarily changes directories to \f2dir\fP while processing the following \f2inputfiles\fP argument. Multiple \f2\-C\ \fP\f2dir\fP \f2inputfiles\fP sets are allowed.
-+\-C\ dir
-+Temporarily changes directories to \f2dir\fP while processing the following \f2inputfiles\fP argument. Multiple \f2\-C\ \fP\f2dir\fP \f2inputfiles\fP sets are allowed.
- .TP 3
--\-Joption
--Option to be passed into the Java runtime environment. (There must be no space between \f2\-J\fP and \f2option\fP).
-+\-Joption
-+Option to be passed into the Java runtime environment. (There must be no space between \f2\-J\fP and \f2option\fP).
- .RE
-
- .LP
- .SH "DESCRIPTION"
- .LP
--The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the
-+The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the
- .na
- \f2ZLIB\fP @
- .fi
--http://www.gzip.org/zlib/ compression format. However, \f3jar\fP was designed mainly package java applets or applications into a single archive. When the components of an applet or application (files, images and sounds) are combined into a single archive, they can be downloaded by a java agent (like a browser) in a single HTTP transaction, rather than requiring a new connection for each piece. This dramatically improves download times. \f3jar\fP also compresses files and so further improves download time. In addition, it allows individual entries in a file to be signed by the applet author so that their origin can be authenticated. The syntax for the jar tool is almost identical to the syntax for the \f2tar\fP command. A \f3jar\fP archive can be used as a class path entry, whether or not it is compressed.
-+http://www.gzip.org/zlib/ compression format. However, \f3jar\fP was designed mainly package java applets or applications into a single archive. When the components of an applet or application (files, images and sounds) are combined into a single archive, they can be downloaded by a java agent (like a browser) in a single HTTP transaction, rather than requiring a new connection for each piece. This dramatically improves download times. \f3jar\fP also compresses files and so further improves download time. In addition, it allows individual entries in a file to be signed by the applet author so that their origin can be authenticated. The syntax for the jar tool is almost identical to the syntax for the \f2tar\fP command. A \f3jar\fP archive can be used as a class path entry, whether or not it is compressed.
- .LP
- Typical usage to combine files into a jar file is:
- .LP
-@@ -94,11 +94,11 @@
- .fi
-
- .LP
--In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the
-+In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the
- .na
- \f2JAR file specification\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file.
- .LP
- If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option:
- .LP
-@@ -118,7 +118,7 @@
- .br
-
- .LP
--\f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file:
-+\f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file:
- .nf
- \f3
- .fl
-@@ -128,7 +128,7 @@
- .fi
-
- .LP
--The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents.
-+The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents.
- .LP
- To extract the files from a jar file, use \f2x\fP:
- .LP
-@@ -154,11 +154,11 @@
-
- .LP
- .LP
--Beginning with version 1.3 of the JDK, the \f2jar\fP utility supports
-+Beginning with version 1.3 of the JDK, the \f2jar\fP utility supports
- .na
- \f2JarIndex\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
- .LP
- .nf
- \f3
-@@ -188,21 +188,21 @@
-
- .LP
- .LP
--To review command samples which use \f2jar\fP to opeate on jar files and jar file manifests, see Examples, below. Also refer to the jar trail of the
-+To review command samples which use \f2jar\fP to opeate on jar files and jar file manifests, see Examples, below. Also refer to the jar trail of the
- .na
- \f2Java Tutorial\fP @
- .fi
--http://download.oracle.com/javase/tutorial/deployment/jar.
-+http://docs.oracle.com/javase/tutorial/deployment/jar.
- .LP
- .SH "OPTIONS"
- .LP
- .RS 3
- .TP 3
--c
--Creates a new archive file named \f2jarfile\fP (if \f2f\fP is specified) or to standard output (if \f2f\fP and \f2jarfile\fP are omitted). Add to it the files and directories specified by \f2inputfiles\fP.
-+c
-+Creates a new archive file named \f2jarfile\fP (if \f2f\fP is specified) or to standard output (if \f2f\fP and \f2jarfile\fP are omitted). Add to it the files and directories specified by \f2inputfiles\fP.
- .TP 3
--u
--Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example:
-+u
-+Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example:
- .nf
- \f3
- .fl
-@@ -210,7 +210,7 @@
- .fl
- \fP
- .fi
--would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example:
-+would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example:
- .nf
- \f3
- .fl
-@@ -218,16 +218,16 @@
- .fl
- \fP
- .fi
--updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP.
-+updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP.
- .TP 3
--x
--Extracts files and directories from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are extracted. Otherwise, all files and directories are extracted. The time and date of the extracted files are those given in the archive.
-+x
-+Extracts files and directories from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are extracted. Otherwise, all files and directories are extracted. The time and date of the extracted files are those given in the archive.
- .TP 3
--t
--Lists the table of contents from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are listed. Otherwise, all files and directories are listed.
-+t
-+Lists the table of contents from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are listed. Otherwise, all files and directories are listed.
- .TP 3
--i
--Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example:
-+i
-+Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example:
- .nf
- \f3
- .fl
-@@ -236,25 +236,25 @@
- \fP
- .fi
- .LP
--would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
-+would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
- .TP 3
--f
--Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u).
-+f
-+Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u).
- .TP 3
--v
--Generates verbose output to standard output. Examples shown below.
-+v
-+Generates verbose output to standard output. Examples shown below.
- .TP 3
--0
--(zero) Store without using ZIP compression.
-+0
-+(zero) Store without using ZIP compression.
- .TP 3
--M
--Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u).
-+M
-+Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u).
- .TP 3
--m
-+m
- Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
- .br
- .br
--On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use:
-+On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use:
- .nf
- \f3
- .fl
-@@ -262,18 +262,18 @@
- .fl
- \fP
- .fi
--You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the
-+You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the
- .na
- \f2JAR Files\fP @
- .fi
--http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
-+http://docs.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option.
- .TP 3
--e
-+e
- Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file.
- .br
- .br
- .br
--For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP:
-+For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP:
- .nf
- \f3
- .fl
-@@ -281,7 +281,7 @@
- .fl
- \fP
- .fi
--The java runtime can directly invoke this application by running the following command:
-+The java runtime can directly invoke this application by running the following command:
- .nf
- \f3
- .fl
-@@ -289,7 +289,7 @@
- .fl
- \fP
- .fi
--If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways:
-+If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways:
- .nf
- \f3
- .fl
-@@ -297,7 +297,7 @@
- .fl
- \fP
- .fi
--or
-+or
- .nf
- \f3
- .fl
-@@ -305,13 +305,13 @@
- .fl
- \fP
- .fi
--\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
-+\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted.
- .TP 3
--\-C\ dir
-+\-C\ dir
- Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility.
- .br
- .br
--For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP:
-+For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP:
- .nf
- \f3
- .fl
-@@ -319,7 +319,7 @@
- .fl
- \fP
- .fi
--This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP.
-+This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP.
- .nf
- \f3
- .fl
-@@ -327,7 +327,7 @@
- .fl
- \fP
- .fi
--If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP:
-+If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP:
- .nf
- \f3
- .fl
-@@ -345,14 +345,14 @@
- .fi
- .LP
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java runtime environment, where \f2option\fP is one of the options described on the reference page for the java application launcher. For example, \f4\-J\-Xmx48M\fP sets the maximum memory to 48 megabytes. It is a common convention for \f2\-J\fP to pass options to the underlying runtime environment.
-+\-Joption
-+Pass \f2option\fP to the Java runtime environment, where \f2option\fP is one of the options described on the reference page for the java application launcher. For example, \f4\-J\-Xmx48M\fP sets the maximum memory to 48 megabytes. It is a common convention for \f2\-J\fP to pass options to the underlying runtime environment.
- .RE
-
- .LP
- .SH "COMMAND LINE ARGUMENT FILES"
- .LP
--To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system.
-+To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system.
- .LP
- An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
- .LP
-@@ -360,7 +360,7 @@
- When executing \f2jar\fP, pass in the path and name of each argument file with the \f2@\fP leading character. When \f2jar\fP encounters an argument beginning with the character \f2@\fP, it expands the contents of that file into the argument list.
- .br
- .br
--The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command:
-+The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command:
- .LP
- .nf
- \f3
-@@ -382,7 +382,7 @@
- .fi
-
- .LP
--An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example:
-+An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example:
- .nf
- \f3
- .fl
-@@ -397,7 +397,7 @@
- .LP
- .SH "EXAMPLES"
- .LP
--To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date.
-+To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date.
- .nf
- \f3
- .fl
-@@ -435,7 +435,7 @@
- .fi
-
- .LP
--If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file:
-+If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file:
- .nf
- \f3
- .fl
-@@ -481,7 +481,7 @@
- .fi
-
- .LP
--To see the entry names in the jarfile, use the \f2t\fP option:
-+To see the entry names in the jarfile, use the \f2t\fP option:
- .nf
- \f3
- .fl
-@@ -526,7 +526,7 @@
- .br
-
- .LP
--If you specify the \f2Class\-path\fP attribute in the \f2main.jar\fP manifest as:
-+If you specify the \f2Class\-path\fP attribute in the \f2main.jar\fP manifest as:
- .nf
- \f3
- .fl
-@@ -536,7 +536,7 @@
- .fi
-
- .LP
--then you can use the \f2\-i\fP option to speed up the class loading time for your application:
-+then you can use the \f2\-i\fP option to speed up the class loading time for your application:
- .nf
- \f3
- .fl
-@@ -546,34 +546,34 @@
- .fi
-
- .LP
--An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
-+An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources.
- .SH "SEE ALSO"
- .LP
- .LP
- .na
- \f2The Jar Overview\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
- .LP
- .LP
- .na
- \f2The Jar File Specification\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
- .LP
- .LP
- .na
- \f2The JarIndex Spec\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
- .LP
- .LP
- .na
- \f2Jar Tutorial\fP @
- .fi
--http://download.oracle.com/javase/tutorial/deployment/jar/index.html
-+http://docs.oracle.com/javase/tutorial/deployment/jar/index.html
- .LP
- .LP
- pack200(1)
- .LP
--
-+
---- jdk/src/bsd/doc/man/jarsigner.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jarsigner.1 2014-01-18 12:19:24.000000000 -0800
-@@ -1,1567 +1,985 @@
--." 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
--." under the terms of the GNU General Public License version 2 only, as
--." published by the Free Software Foundation.
--."
--." This code is distributed in the hope that it will be useful, but WITHOUT
--." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--." version 2 for more details (a copy is included in the LICENSE file that
--." accompanied this code).
--."
--." You should have received a copy of the GNU General Public License version
--." 2 along with this work; if not, write to the Free Software Foundation,
--." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--."
--." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--." or visit www.oracle.com if you need additional information or have any
--." questions.
--."
--.TH jarsigner 1 "10 May 2011"
--
--.LP
--.SH "Name"
--jarsigner \- JAR Signing and Verification Tool
--.LP
--.LP
--Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files.
--.LP
--.SH "SYNOPSIS"
--.LP
--.nf
--\f3
--.fl
--\fP\f3jarsigner\fP [ options ] jar\-file alias
--.fl
--\f3jarsigner\fP \-verify [ options ] jar\-file [alias...]
--.fl
--.fi
--
--.LP
--.LP
--The jarsigner \-verify command can take zero or more keystore alias names after the jar filename. When specified, jarsigner will check that the certificate used to verify each signed entry in the jar file matches one of the keystore aliases. The aliases are defined in the keystore specified by \-keystore, or the default keystore.
--.LP
--.SH "DESCRIPTION"
--.LP
--.LP
--The \f3jarsigner\fP tool is used for two purposes:
--.LP
--.RS 3
--.TP 3
--1.
--to sign Java ARchive (JAR) files, and
--.TP 3
--2.
--to verify the signatures and integrity of signed JAR files.
--.RE
--
--.LP
--.LP
--The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution. A tool named jar(1) enables developers to produce JAR files. (Technically, any zip file can also be considered a JAR file, although when created by \f3jar\fP or processed by \f3jarsigner\fP, JAR files also contain a META\-INF/MANIFEST.MF file.)
--.LP
--.LP
--A \f2digital signature\fP is a string of bits that is computed from some data (the data being "signed") and the private key of an entity (a person, company, etc.). Like a handwritten signature, a digital signature has many useful characteristics:
--.LP
--.RS 3
--.TP 2
--o
--Its authenticity can be verified, via a computation that uses the public key corresponding to the private key used to generate the signature.
--.TP 2
--o
--It cannot be forged, assuming the private key is kept secret.
--.TP 2
--o
--It is a function of the data signed and thus can't be claimed to be the signature for other data as well.
--.TP 2
--o
--The signed data cannot be changed; if it is, the signature will no longer verify as being authentic.
--.RE
--
--.LP
--.LP
--In order for an entity's signature to be generated for a file, the entity must first have a public/private key pair associated with it, and also one or more certificates authenticating its public key. A \f2certificate\fP is a digitally signed statement from one entity, saying that the public key of some other entity has a particular value.
--.LP
--.LP
--\f3jarsigner\fP uses key and certificate information from a \f2keystore\fP to generate digital signatures for JAR files. A keystore is a database of private keys and their associated X.509 certificate chains authenticating the corresponding public keys. The keytool(1) utility is used to create and administer keystores.
--.LP
--.LP
--\f3jarsigner\fP uses an entity's private key to generate a signature. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file. \f3jarsigner\fP can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file).
--.LP
--.LP
--\f3jarsigner\fP can generate signatures that include a timestamp, thus enabling systems/deployer (including Java Plug\-in) to check whether the JAR file was signed while the signing certificate was still valid. In addition, APIs will allow applications to obtain the timestamp information.
--.LP
--.LP
--At this time, \f3jarsigner\fP can only sign JAR files created by the SDK jar(1) tool or zip files. (JAR files are the same as zip files, except they also have a META\-INF/MANIFEST.MF file. Such a file will automatically be created when \f3jarsigner\fP signs a zip file.)
--.LP
--.LP
--The default \f3jarsigner\fP behavior is to \f2sign\fP a JAR (or zip) file. Use the \f2\-verify\fP option to instead have it \f2verify\fP a signed JAR file.
--.LP
--.SS
--Keystore Aliases
--.LP
--.LP
--All keystore entities are accessed via unique \f2aliases\fP.
--.LP
--.LP
--When using \f3jarsigner\fP to sign a JAR file, you must specify the alias for the keystore entry containing the private key needed to generate the signature. For example, the following will sign the JAR file named "MyJARFile.jar", using the private key associated with the alias "duke" in the keystore named "mystore" in the "working" directory. Since no output file is specified, it overwrites MyJARFile.jar with the signed JAR file.
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
--.LP
--.SS
--Keystore Location
--.LP
--.LP
--\f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory.
--.LP
--.LP
--Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device.
--.LP
--.SS
--Keystore Implementation
--.LP
--.LP
--The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
--.LP
--.LP
--Currently, there are two command\-line tools that make use of keystore implementations (\f3keytool\fP and \f3jarsigner\fP), and also a GUI\-based tool named \f3Policy Tool\fP. Since \f2KeyStore\fP is publicly available, Java 2 SDK users can write additional security applications that use it.
--.LP
--.LP
--There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
--.LP
--.LP
--Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a provider and supply a KeystoreSpi subclass implementation, as described in
--.na
--\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
--.fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
--.LP
--.LP
--Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
--.LP
--.LP
--\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
--.LP
--.LP
--For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu.
--.LP
--.LP
--If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the SDK security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
--.LP
--.LP
--Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
--.LP
--.LP
--The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
--.LP
--.nf
--\f3
--.fl
-- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file:
--.LP
--.nf
--\f3
--.fl
-- keystore.type=jks
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: Case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
--.LP
--.LP
--To have the tools utilize a keystore implementation other than the default, change that line to specify a different keystore type. For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
--.LP
--.nf
--\f3
--.fl
-- keystore.type=pkcs12
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that if you us the PKCS#11 provider package, you should refer to the
--.na
--\f2KeyTool and JarSigner\fP @
--.fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
--.LP
--.SS
--Supported Algorithms
--.LP
--.LP
--By default, \f3jarsigner\fP signs a JAR file using one of the following:
--.LP
--.RS 3
--.TP 2
--o
--DSA (Digital Signature Algorithm) with the SHA1 digest algorithm
--.TP 2
--o
--RSA algorithm with the SHA256 digest algorithm.
--.TP 2
--o
--EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm).
--.RE
--
--.LP
--.LP
--That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm.
--.LP
--.LP
--These default signature algorithms can be overridden using the \f2\-sigalg\fP option.
--.LP
--.SS
--The Signed JAR File
--.LP
--.LP
--When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory:
--.LP
--.RS 3
--.TP 2
--o
--a signature file, with a .SF extension, and
--.TP 2
--o
--a signature block file, with a .DSA, .RSA, or .EC extension.
--.RE
--
--.LP
--.LP
--The base file names for these two files come from the value of the \f2\-sigFile\fP option. For example, if the option appears as
--.LP
--.nf
--\f3
--.fl
--\-sigFile MKSIGN
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The files are named "MKSIGN.SF" and "MKSIGN.DSA".
--.LP
--.LP
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens.
--.LP
--\f3The Signature (.SF) File\fP
--.LP
--.LP
--A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following:
--.LP
--.RS 3
--.TP 2
--o
--the file name,
--.TP 2
--o
--the name of the digest algorithm used (SHA), and
--.TP 2
--o
--a SHA digest value.
--.RE
--
--.LP
--.LP
--In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file. In the .SF file, on the other hand, the digest value for a given source file is the hash of the three lines in the manifest file for the source file.
--.LP
--.LP
--The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification.
--.LP
--\f3The Signature Block File\fP
--.LP
--The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used.
--.SS
--Signature Timestamp
--.LP
--.LP
--\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
--.LP
--.RS 3
--.TP 2
--o
--\f2\-tsa url\fP
--.TP 2
--o
--\f2\-tsacert alias\fP
--.TP 2
--o
--\f2\-altsigner class\fP
--.TP 2
--o
--\f2\-altsignerpath classpathlist\fP
--.RE
--
--.LP
--.LP
--Each of these options is detailed in the Options section below.
--.LP
--.SS
--JAR File Verification
--.LP
--.LP
--A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps:
--.LP
--.RS 3
--.TP 3
--1.
--Verify the signature of the .SF file itself.
--.br
--.br
--That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
--.TP 3
--2.
--Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
--.br
--.br
--The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
--.br
--.br
--If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
--.br
--.br
--One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
--.TP 3
--3.
--Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails.
--.RE
--
--.LP
--.LP
--If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP.
--.LP
--.SS
--Multiple Signatures for a JAR File
--.LP
--.LP
--A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner myBundle.jar susan
--.fl
-- jarsigner myBundle.jar kevin
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When a JAR file is signed multiple times, there are multiple .SF and .DSA files in the resulting JAR file, one pair for each signature. Thus, in the example above, the output JAR file includes files with the following names:
--.LP
--.nf
--\f3
--.fl
-- SUSAN.SF
--.fl
-- SUSAN.DSA
--.fl
-- KEVIN.SF
--.fl
-- KEVIN.DSA
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP.
--.LP
--.SH "OPTIONS"
--.LP
--.LP
--The various \f3jarsigner\fP options are listed and described below. Note:
--.LP
--.RS 3
--.TP 2
--o
--All option names are preceded by a minus sign (\-).
--.TP 2
--o
--The options may be provided in any order.
--.TP 2
--o
--Items in italics (option values) represent the actual values that must be supplied.
--.TP 2
--o
--The \f2\-keystore\fP, \f2\-storepass\fP, \f2\-keypass\fP, \f2\-sigfile\fP, \f2\-sigalg\fP, \f2\-digestalg\fP, and \f2\-signedjar\fP options are only relevant when signing a JAR file, not when verifying a signed JAR file. Similarly, an alias is only specified on the command line when signing a JAR file.
--.RE
--
--.LP
--.RS 3
--.TP 3
--\-keystore url
--Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
--.br
--.br
--A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
--.br
--.br
--A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
--.br
--.br
--Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is,
--.nf
--\f3
--.fl
-- \-keystore \fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--is treated as equivalent to
--.nf
--\f3
--.fl
-- \-keystore file:\fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--If the Sun PKCS#11 provider has been configured in the \f2java.security\fP security properties file (located in the JRE's \f2$JAVA_HOME/lib/security\fP directory), then keytool and jarsigner can operate on the PKCS#11 token by specifying these options:
--.RS 3
--.TP 2
--o
--\f2\-keystore NONE\fP
--.TP 2
--o
--\f2\-storetype PKCS11\fP
--.RE
--For example, this command lists the contents of the configured PKCS#11 token:
--.nf
--\f3
--.fl
-- jarsigner \-keystore NONE \-storetype PKCS11 \-list
--.fl
--\fP
--.fi
--.TP 3
--\-storetype storetype
--Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
--.br
--.br
--The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
--.TP 3
--\-storepass[:env | :file] argument
--Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-keypass[:env | :file] argument
--Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-sigfile file
--Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
--.br
--.br
--The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
--.br
--.br
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
--.TP 3
--\-sigalg algorithm
--Specifies the name of the signature algorithm to use to sign the JAR file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-digestalg algorithm
--Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-signedjar file
--Specifies the name to be used for the signed JAR file.
--.br
--.br
--If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
--.TP 3
--\-verify
--If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
--.br
--.br
--It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
--.br
--.br
--For further information on verification, see JAR File Verification.
--.TP 3
--\-certs
--If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes
--.RS 3
--.TP 2
--o
--the name of the type of certificate (stored in the .DSA file) that certifies the signer's public key
--.TP 2
--o
--if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer
--.RE
--The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed:
--.RS 3
--.TP 2
--o
--in parentheses, the alias name for the keystore entry for that signer. If the signer actually comes from a JDK 1.1 identity database instead of from a keystore, the alias name will appear in brackets instead of parentheses.
--.RE
--.TP 3
--\-certchain file
--Specifies the certificate chain to be used, if the certificate chain associated with the private key of the keystore entry, addressed by the alias specified on the command line, is not complete. This may happen if the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain. The file can be a sequence of X.509 certificates concatenated together, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as BASE64 encoding) as defined by the Internet RFC 1421 standard.
--.TP 3
--\-verbose
--If this appears on the command line, it indicates "verbose" mode, which causes \f3jarsigner\fP to output extra information as to the progress of the JAR signing or verification.
--.TP 3
--\-internalsf
--In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-sectionsonly
--If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
--.br
--.br
--By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
--.br
--.br
--For further information, see JAR File Verification.
--.br
--.br
--\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-protected
--Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
--.TP 3
--\-providerClass provider\-class\-name
--Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
--.br
--.br
--Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file.
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerClass sun.security.pkcs11.SunPKCS11 \\
--.fl
-- \-providerArg /foo/bar/token.config \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-providerName providerName
--If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
--.br
--.br
--For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the
--.na
--\f2configuration attributes table\fP @
--.fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerName SunPKCS11\-SmartCard \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-Jjavaoption
--Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
--.TP 3
--\-tsa url
--If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
--.br
--.br
--To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in
--.na
--\f2RFC 3161\fP @
--.fi
--http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
--.TP 3
--\-tsacert alias
--If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
--.br
--.br
--The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
--.TP 3
--\-altsigner class
--Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
--.br
--.br
--For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
--.TP 3
--\-altsignerpath classpathlist
--Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
--.br
--.br
--An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
--.br
--.br
--Example of specifying the path to a jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/lib/authsigner.jar
--.fl
--\fP
--.fi
--Note that the JAR file name is included.
--.br
--.br
--Example of specifying the path to the jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
--.fl
--\fP
--.fi
--Note that the JAR file name is omitted.
--.TP 3
--\-strict
--During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details.
--.TP 3
--\-verbose:sub\-options
--For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information.
--.RE
--
--.LP
--.SH "EXAMPLES"
--.LP
--.SS
--Signing a JAR File
--.LP
--.LP
--Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that there is no \f2\-sigfile\fP specified in the command above, so the generated .SF and .DSA files to be placed in the signed JAR file will have default names based on the alias name. That is, they will be named \f2JANE.SF\fP and \f2JANE.DSA\fP.
--.LP
--.LP
--If you want to be prompted for the store password and the private key password, you could shorten the above command to
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore
--.fl
-- \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the keystore to be used is the default keystore (the one named ".keystore" in your home directory), you don't need to specify a keystore, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Finally, if you want the signed JAR file to simply overwrite the input JAR file (\f2bundle.jar\fP), you don't need to specify a \f2\-signedjar\fP option:
--.LP
--.nf
--\f3
--.fl
-- jarsigner bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verifying a Signed JAR File
--.LP
--.LP
--To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify sbundle.jar
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the verification is successful,
--.LP
--.nf
--\f3
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--is displayed. Otherwise, an error message appears.
--.LP
--.LP
--You can get more information if you use the \f2\-verbose\fP option. A sample use of \f3jarsigner\fP with the \f2\-verbose\fP option is shown below, along with sample output:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify \-verbose sbundle.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx.class
--.fl
-- smk 849 Fri Sep 26 16:12:46 PDT 1997 test.class
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification with Certificate Information
--.LP
--.LP
--If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.SF
--.fl
-- 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst.class
--.fl
--
--.fl
-- X.509, CN=Test Group, OU=Java Software, O=Sun Microsystems, L=CUP, S=CA, C=US (javatest)
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the certificate for a signer is not an X.509 certificate, there is no distinguished name information. In that case, just the certificate type and the alias are shown. For example, if the certificate is a PGP certificate, and the alias is "bob", you'd get
--.LP
--.nf
--\f3
--.fl
-- PGP, (bob)
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification of a JAR File that Includes Identity Database Signers
--.LP
--.LP
--If a JAR file has been signed using the JDK 1.1 \f3javakey\fP tool, and thus the signer is an alias in an identity database, the verification output includes an "i" symbol. If the JAR file has been signed by both an alias in an identity database and an alias in a keystore, both "k" and "i" appear.
--.LP
--.LP
--When the \f2\-certs\fP option is used, any identity database aliases are shown in square brackets rather than the parentheses used for keystore aliases. For example:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.SF
--.fl
-- 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.DSA
--.fl
-- smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile.html
--.fl
--
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
-- X.509, CN=Duke, OU=Java Software, O=Sun, L=cup, S=ca, C=us [duke]
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
-- i = at least one certificate was found in identity scope
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias.
--.LP
--.SH "WARNINGS"
--.LP
--During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows:
--.nf
--\f3
--.fl
-- hasExpiringCert 2
--.fl
-- This jar contains entries whose signer certificate will expire within six months
--.fl
--
--.fl
-- hasExpiredCert 4
--.fl
-- This jar contains entries whose signer certificate has expired.
--.fl
--
--.fl
-- notYetValidCert 4
--.fl
-- This jar contains entries whose signer certificate is not yet valid.
--.fl
--
--.fl
-- chainNotValidated 4
--.fl
-- This jar contains entries whose certificate chain cannot be correctly validated.
--.fl
--
--.fl
-- badKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--.fl
--
--.fl
-- badExtendedKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's ExtendedKeyUsage extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- badNetscapeCertType 8
--.fl
-- This jar contains entries whose signer certificate's NetscapeCertType extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- hasUnsignedEntry 16
--.fl
-- This jar contains unsigned entries which have not been integrity\-checked.
--.fl
--
--.fl
-- notSignedByAlias 32
--.fl
-- This jar contains signed entries which are not signed by the specified alias(es)
--.fl
--
--.fl
-- aliasNotInStore 32
--.fl
-- This jar contains signed entries that are not signed by alias in this keystore
--.fl
--
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned.
--.LP
--.LP
--\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned:
--.LP
--.nf
--\f3
--.fl
--failure 1
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Compatibility with JDK 1.1
--.LP
--.LP
--The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them.
--.LP
--.LP
--The new keystore architecture replaces the identity database that \f3javakey\fP created and managed. There is no backwards compatibility between the keystore format and the database format used by \f3javakey\fP in 1.1. However,
--.LP
--.RS 3
--.TP 2
--o
--It is possible to import the information from an identity database into a keystore, via the \f3keytool\fP \f2\-identitydb\fP command.
--.TP 2
--o
--\f3jarsigner\fP can sign JAR files also previously signed using \f3javakey\fP.
--.TP 2
--o
--\f3jarsigner\fP can verify JAR files signed using \f3javakey\fP. Thus, it recognizes and can work with signer aliases that are from a JDK 1.1 identity database rather than a Java 2 SDK keystore.
--.RE
--
--.LP
--.LP
--The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform.
--.LP
--.LP
--.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
--.de 35
--.ps \n(.s
--.vs \n(.vu
--.in \n(.iu
--.if \n(.u .fi
--.if \n(.j .ad
--.if \n(.j=0 .na
--..
--.nf
--.nr #~ 0
--.if n .nr #~ 0.6n
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.fc
--.nr 33 \n(.s
--.rm 80 81 82 83 84
--.nr 34 \n(.lu
--.eo
--.am 82
--.br
--.di a+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(82 .ll \n(82u
--.in 0
--\f3Trusted Identity imported into Java 2 Platform keystore from 1.1 database (4)\fP
--.br
--.di
--.nr a| \n(dn
--.nr a- \n(dl
--..
--.ec \
--.eo
--.am 83
--.br
--.di b+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(83 .ll \n(83u
--.in 0
--\f3Policy File grants privileges to Identity/Alias\fP
--.br
--.di
--.nr b| \n(dn
--.nr b- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di c+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr c| \n(dn
--.nr c- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di d+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr d| \n(dn
--.nr d- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di e+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr e| \n(dn
--.nr e- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di f+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (3)
--.br
--.di
--.nr f| \n(dn
--.nr f- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di g+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (1,3)
--.br
--.di
--.nr g| \n(dn
--.nr g- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di h+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file.
--.br
--.di
--.nr h| \n(dn
--.nr h- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di i+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file. (2)
--.br
--.di
--.nr i| \n(dn
--.nr i- \n(dl
--..
--.ec \
--.35
--.nf
--.ll \n(34u
--.nr 80 0
--.nr 38 \w\f3JAR File Type\fP
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wUnsigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.80
--.rm 80
--.nr 81 0
--.nr 38 \w\f3Identity in 1.1 database\fP
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.81
--.rm 81
--.nr 82 0
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.82
--.rm 82
--.nr 38 \n(a-
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 83 0
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.83
--.rm 83
--.nr 38 \n(b-
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 84 0
--.nr 38 \w\f3Privileges Granted\fP
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.84
--.rm 84
--.nr 38 \n(c-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(d-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(e-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(f-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(g-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(h-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(i-
--.if \n(84<\n(38 .nr 84 \n(38
--.35
--.nf
--.ll \n(34u
--.nr 38 1n
--.nr 79 0
--.nr 40 \n(79+(0*\n(38)
--.nr 80 +\n(40
--.nr 41 \n(80+(3*\n(38)
--.nr 81 +\n(41
--.nr 42 \n(81+(3*\n(38)
--.nr 82 +\n(42
--.nr 43 \n(82+(3*\n(38)
--.nr 83 +\n(43
--.nr 44 \n(83+(3*\n(38)
--.nr 84 +\n(44
--.nr TW \n(84
--.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units
--.fc  
--.nr #T 0-1
--.nr #a 0-1
--.eo
--.de T#
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.mk ##
--.nr ## -1v
--.ls 1
--.ls
--..
--.ec
--.ne \n(a|u+\n(.Vu
--.ne \n(b|u+\n(.Vu
--.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'\f3JAR File Type\fP\h'|\n(41u'\f3Identity in 1.1 database\fP\h'|\n(42u'\h'|\n(43u'\h'|\n(44u'\f3Privileges Granted\fP
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(42u
--.in +\n(37u
--.a+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(43u
--.in +\n(37u
--.b+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(c|u+\n(.Vu
--.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.c+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(d|u+\n(.Vu
--.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Unsigned JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.d+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(e|u+\n(.Vu
--.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.e+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(f|u+\n(.Vu
--.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.f+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(g|u+\n(.Vu
--.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.g+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(h|u+\n(.Vu
--.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.h+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(i|u+\n(.Vu
--.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.i+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'All privileges
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'All privileges (1)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'All privileges (1)
--.fc
--.nr T. 1
--.T# 1
--.35
--.rm a+
--.rm b+
--.rm c+
--.rm d+
--.rm e+
--.rm f+
--.rm g+
--.rm h+
--.rm i+
--.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
--
--.LP
--.LP
--Notes:
--.LP
--.RS 3
--.TP 3
--1.
--If an identity/alias is mentioned in the policy file, it must be imported into the keystore for the policy file to have any effect on privileges granted.
--.TP 3
--2.
--The policy file/keystore combination has precedence over a trusted identity in the identity database.
--.TP 3
--3.
--Untrusted identities are ignored in the Java 2 platform.
--.TP 3
--4.
--Only trusted identities can be imported into Java 2 SDK keystores.
--.RE
--
--.LP
--.SH "SEE ALSO"
--.LP
--.RS 3
--.TP 2
--o
--jar(1) tool documentation
--.TP 2
--o
--keytool(1) tool documentation
--.TP 2
--o
--the
--.na
--\f4Security\fP @
--.fi
--http://download.oracle.com/javase/tutorial/security/index.html trail of the
--.na
--\f4Java Tutorial\fP @
--.fi
--http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
--.RE
--
--.LP
--
-+'\" t
-+.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-+.\"
-+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+.\"
-+.\" This code is free software; you can redistribute it and/or modify it
-+.\" under the terms of the GNU General Public License version 2 only, as
-+.\" published by the Free Software Foundation.
-+.\"
-+.\" 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.
-+.\"
-+.\" Arch: generic
-+.\" Software: JDK 7
-+.\" Date: 6 August 2013
-+.\" SectDesc: Security Tools
-+.\" Title: jarsigner.1
-+.\"
-+.if n .pl 99999
-+.TH jarsigner 1 "6 August 2013" "JDK 7" "Security Tools"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+
-+.SH NAME
-+jarsigner \- Signs and verifies Java Archive (JAR) files\&.
-+.SH SYNOPSIS
-+.sp
-+.nf
-+
-+\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
-+.fi
-+.nf
-+
-+\fBjarsigner\fR \fB\-verify\fR [ \fIoptions\fR ] \fIjar\-file\fR [\fIalias \&.\&.\&.\fR]
-+.fi
-+.sp
-+.TP
-+\fIoptions\fR
-+The command-line options\&. See Options\&.
-+.TP
-+-verify
-+.br
-+The \f3-verify\fR option can take zero or more keystore alias names after the JAR file name\&. When the \f3-verify\fR option is specified, the \f3jarsigner\fR command checks that the certificate used to verify each signed entry in the JAR file matches one of the keystore aliases\&. The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar verified, with signer errors" is displayed\&.
-+.TP
-+\fIjar-file\fR
-+The JAR file to be signed\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar signed, with signer errors" is displayed\&.
-+.TP
-+\fIalias\fR
-+The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+.SH DESCRIPTION
-+The \f3jarsigner\fR tool has two purposes:
-+.TP 0.2i
-+\(bu
-+To sign Java Archive (JAR) files\&.
-+.TP 0.2i
-+\(bu
-+To verify the signatures and integrity of signed JAR files\&.
-+.PP
-+The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution\&. A tool named \f3jar\fR enables developers to produce JAR files\&. (Technically, any zip file can also be considered a JAR file, although when created by the \f3jar\fR command or processed by the \f3jarsigner\fR command, JAR files also contain a \f3META-INF/MANIFEST\&.MF\fR file\&.)
-+.PP
-+A digital signature is a string of bits that is computed from some data (the data being signed) and the private key of an entity (a person, company, and so on)\&. Similar to a handwritten signature, a digital signature has many useful characteristics:
-+.TP 0.2i
-+\(bu
-+Its authenticity can be verified by a computation that uses the public key corresponding to the private key used to generate the signature\&.
-+.TP 0.2i
-+\(bu
-+It cannot be forged, assuming the private key is kept secret\&.
-+.TP 0.2i
-+\(bu
-+It is a function of the data signed and thus cannot be claimed to be the signature for other data as well\&.
-+.TP 0.2i
-+\(bu
-+The signed data cannot be changed\&. If the data is changed, then the signature cannot be verified as authentic\&.
-+.PP
-+To generate an entity\&'s signature for a file, the entity must first have a public/private key pair associated with it and one or more certificates that authenticate its public key\&. A certificate is a digitally signed statement from one entity that says that the public key of another entity has a particular value\&.
-+.PP
-+The \f3jarsigner\fR command uses key and certificate information from a keystore to generate digital signatures for JAR files\&. A keystore is a database of private keys and their associated X\&.509 certificate chains that authenticate the corresponding public keys\&. The \f3keytool\fR command is used to create and administer keystores\&.
-+.PP
-+The \f3jarsigner\fR command uses an entity\&'s private key to generate a signature\&. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file\&. The \f3jarsigner\fR command can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file)\&.
-+.PP
-+The \f3jarsigner\fR command can generate signatures that include a time stamp that lets a systems or deployer (including Java Plug-in) to check whether the JAR file was signed while the signing certificate was still valid\&. In addition, APIs allow applications to obtain the timestamp information\&.
-+.PP
-+At this time, the \f3jarsigner\fR command can only sign JAR files created by the \f3jar\fR command or zip files\&. JAR files are the same as zip files, except they also have a \f3META-INF/MANIFEST\&.MF\fR file\&. A \f3META-INF/MANIFEST\&.MF\fR file is created when the \f3jarsigner\fR command signs a zip file\&.
-+.PP
-+The default \f3jarsigner\fR command behavior is to sign a JAR or zip file\&. Use the \f3-verify\fR option to verify a signed JAR file\&.
-+.PP
-+The \f3jarsigner\fR command also attempts to validate the signer\&'s certificate after signing or verifying\&. If there is a validation error or any other problem, the command generates warning messages\&. If you specify the \f3-strict\fR option, then the command treats severe warnings as errors\&. See Errors and Warnings\&.
-+.SS KEYSTORE\ ALIASES
-+All keystore entities are accessed with unique aliases\&.
-+.PP
-+When you use the \f3jarsigner\fR command to sign a JAR file, you must specify the alias for the keystore entry that contains the private key needed to generate the signature\&. For example, the following command signs the JAR file named \f3MyJARFile\&.jar\fR with the private key associated with the alias \f3duke\fR in the keystore named \f3mystore\fR in the \f3working\fR directory\&. Because no output file is specified, it overwrites \f3MyJARFile\&.jar\fR with the signed JAR file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password> MyJARFile\&.jar duke\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Keystores are protected with a password, so the store password must be specified\&. You are prompted for it when you do not specify it on the command line\&. Similarly, private keys are protected in a keystore with a password, so the private key\&'s password must be specified, and you are prompted for the password when you do not specify it on the command line and it is not the same as the store password\&.
-+.SS KEYSTORE\ LOCATION
-+The \f3jarsigner\fR command has a \f3-keystore\fR option for specifying the URL of the keystore to be used\&. The keystore is by default stored in a file named \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+.PP
-+On Oracle Solaris systems, \f3user\&.home\fR defaults to the user\&'s home directory\&.
-+.PP
-+The input stream from the \f3-keystore\fR option is passed to the \f3KeyStore\&.load\fR method\&. If \f3NONE\fR is specified as the URL, then a null stream is passed to the \f3KeyStore\&.load\fR method\&. \f3NONE\fR should be specified when the \f3KeyStore\fR class is not file based, for example, when it resides on a hardware token device\&.
-+.SS KEYSTORE\ IMPLEMENTATION
-+The \f3KeyStore\fR class provided in the \f3java\&.security\fR package supplies a number of well-defined interfaces to access and modify the information in a keystore\&. You can have multiple different concrete implementations, where each implementation is for a particular type of keystore\&.
-+.PP
-+Currently, there are two command-line tools that use keystore implementations (\f3keytool\fR and \f3jarsigner\fR), and a GUI-based tool named Policy Tool\&. Because the \f3KeyStore\fR class is publicly available, JDK users can write additional security applications that use it\&.
-+.PP
-+There is a built-in default implementation provided by Oracle that implements the keystore as a file, that uses a proprietary keystore type (format) named JKS\&. The built-in implementation protects each private key with its individual password and protects the integrity of the entire keystore with a (possibly different) password\&.
-+.PP
-+Keystore implementations are provider-based, which means the application interfaces supplied by the \f3KeyStore\fR class are implemented in terms of a Service Provider Interface (SPI)\&. There is a corresponding abstract \f3KeystoreSpi\fR class, also in the \f3java\&.security package\fR, that defines the Service Provider Interface methods that providers must implement\&. The term provider refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API\&. To provide a keystore implementation, clients must implement a provider and supply a \f3KeystoreSpi\fR subclass implementation, as described in How to Implement a Provider in the Java Cryptography Architecture at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider\&.html
-+.PP
-+Applications can choose different types of keystore implementations from different providers, with the \f3getInstance\fR factory method in the \f3KeyStore\fR class\&. A keystore type defines the storage and data format of the keystore information and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself\&. Keystore implementations of different types are not compatible\&.
-+.PP
-+The \f3jarsigner\fR and \f3policytool\fR commands can read file-based keystores from any location that can be specified using a URL\&. In addition, these commands can read non-file-based keystores such as those provided by MSCAPI on Windows and PKCS11 on all platforms\&.
-+.PP
-+For the \f3jarsigner\fR and \f3keytool\fR commands, you can specify a keystore type at the command line with the \f3-storetype\fR option\&. For Policy Tool, you can specify a keystore type with the \fIEdit\fR command in the \fIKeyStore\fR menu\&.
-+.PP
-+If you do not explicitly specify a keystore type, then the tools choose a keystore implementation based on the value of the \f3keystore\&.type\fR property specified in the security properties file\&. The security properties file is called \f3java\&.security\fR, and it resides in the JDK security properties directory, \f3java\&.home/lib/security\fR, where \f3java\&.home\fR is the runtime environment\&'s directory\&. The \f3jre\fR directory in the JDK or the top-level directory of the Java Runtime Environment (JRE)\&.
-+.PP
-+Each tool gets the \f3keystore\&.type\fR value and then examines all the installed providers until it finds one that implements keystores of that type\&. It then uses the keystore implementation from that provider\&.
-+.PP
-+The \f3KeyStore\fR class defines a static method named \f3getDefaultType\fR that lets applications and applets retrieve the value of the \f3keystore\&.type\fR property\&. The following line of code creates an instance of the default keystore type as specified in the \f3keystore\&.type property\fR:
-+.sp
-+.nf
-+\f3KeyStore keyStore = KeyStore\&.getInstance(KeyStore\&.getDefaultType());\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+The default keystore type is \f3jks\fR (the proprietary type of the keystore implementation provided by Oracle)\&. This is specified by the following line in the security properties file:
-+.sp
-+.nf
-+\f3keystore\&.type=jks\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Case does not matter in keystore type designations\&. For example, \f3JKS\fR is the same as \f3jks\fR\&.
-+.PP
-+To have the tools use a keystore implementation other than the default, change that line to specify a different keystore type\&. For example, if you have a provider package that supplies a keystore implementation for a keystore type called \f3pkcs12\fR, then change the line to the following:
-+.sp
-+.nf
-+\f3keystore\&.type=pkcs12\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR If you use the PKCS 11 provider package, then see "KeyTool" and "JarSigner" in Java PKCS #11 Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/p11guide\&.html
-+.SS SUPPORTED\ ALGORITHMS
-+By default, the \f3jarsigner\fR command signs a JAR file using one of the following algorithms:
-+.TP 0.2i
-+\(bu
-+Digital Signature Algorithm (DSA) with the SHA1 digest algorithm
-+.TP 0.2i
-+\(bu
-+RSA algorithm with the SHA256 digest algorithm
-+.TP 0.2i
-+\(bu
-+Elliptic Curve (EC) cryptography algorithm with the SHA256 with Elliptic Curve Digital Signature Algorithm (ECDSA)\&.
-+.PP
-+If the signer\&'s public and private keys are DSA keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA1withDSA\fR algorithm\&. If the signer\&'s keys are RSA keys, then \f3jarsigner\fR attempts to sign the JAR file with the \f3SHA256withRSA\fR algorithm\&. If the signer\&'s keys are EC keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA256withECDSA\fR algorithm\&.
-+.PP
-+These default signature algorithms can be overridden using the \f3-sigalg\fR option\&.
-+.SS THE\ SIGNED\ JAR\ FILE
-+When the \f3jarsigner\fR command is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META-INF directory:
-+.TP 0.2i
-+\(bu
-+A signature file with an \f3\&.SF\fR extension
-+.TP 0.2i
-+\(bu
-+A signature block file with a \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR extension
-+.PP
-+The base file names for these two files come from the value of the \f3-sigFile\fR option\&. For example, when the option is \f3-sigFile MKSIGN\fR, the files are named \f3MKSIGN\&.SF\fR and \f3MKSIGN\&.DSA\fR
-+.PP
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to uppercase\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not allowed in a signature file name, then each such character is converted to an underscore (_) character in forming the file name\&. Valid characters include letters, digits, underscores, and hyphens\&.
-+.PP
-+Signature File
-+
-+A signature file (\f3\&.SF\fR file) looks similar to the manifest file that is always included in a JAR file when the \f3jarsigner\fR command is used to sign the file\&. For each source file included in the JAR file, the \f3\&.SF\fR file has three lines, such as in the manifest file, that list the following:
-+.TP 0.2i
-+\(bu
-+File name
-+.TP 0.2i
-+\(bu
-+Name of the digest algorithm (SHA)
-+.TP 0.2i
-+\(bu
-+SHA digest value
-+.PP
-+In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file\&. In the \f3\&.SF\fR file, the digest value for a specified source file is the hash of the three lines in the manifest file for the source file\&.
-+.PP
-+The signature file, by default, includes a header with a hash of the whole manifest file\&. The header also contains a hash of the manifest header\&. The presence of the header enables verification optimization\&. See JAR File Verification\&.
-+.PP
-+Signature Block File
-+
-+The \f3\&.SF\fR file is signed and the signature is placed in the signature block file\&. This file also contains, encoded inside it, the certificate or certificate chain from the keystore that authenticates the public key corresponding to the private key used for signing\&. The file has the extension \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR, depending on the digest algorithm used\&.
-+.SS SIGNATURE\ TIME\ STAMP
-+The \f3jarsigner\fR command can generate and store a signature time stamp when signing a JAR file\&. In addition, \f3jarsigner\fR supports alternative signing mechanisms\&. This behavior is optional and is controlled by the user at the time of signing through these options\&. See Options\&.
-+.sp
-+.nf
-+\f3\-tsa \fIurl\fR\fP
-+.fi
-+.nf
-+\f3\-tsacert \fIalias\fR\fP
-+.fi
-+.nf
-+\f3\-altsigner \fIclass\fR\fP
-+.fi
-+.nf
-+\f3\-altsignerpath \fIclasspathlist\fR\fP
-+.fi
-+.nf
-+\f3\-tsapolicyid \fIpolicyid\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS JAR\ FILE\ VERIFICATION
-+A successful JAR file verification occurs when the signatures are valid, and none of the files that were in the JAR file when the signatures were generated have changed since then\&. JAR file verification involves the following steps:
-+.TP 0.4i
-+1\&.
-+Verify the signature of the \f3\&.SF\fR file\&.
-+
-+The verification ensures that the signature stored in each signature block (\f3\&.DSA\fR) file was generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the \f3\&.DSA\fR file\&. It also ensures that the signature is a valid signature of the corresponding signature (\f3\&.SF\fR) file, and thus the \f3\&.SF\fR file was not tampered with\&.
-+.TP 0.4i
-+2\&.
-+Verify the digest listed in each entry in the \f3\&.SF\fR file with each corresponding section in the manifest\&.
-+
-+The \f3\&.SF\fR file by default includes a header that contains a hash of the entire manifest file\&. When the header is present, the verification can check to see whether or not the hash in the header matches the hash of the manifest file\&. If there is a match, then verification proceeds to the next step\&.
-+
-+If there is no match, then a less optimized verification is required to ensure that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See Signature File\&.
-+
-+One reason the hash of the manifest file that is stored in the \f3\&.SF\fR file header might not equal the hash of the current manifest file is that one or more files were added to the JAR file (with the \f3jar\fR tool) after the signature and \f3\&.SF\fR file were generated\&. When the \f3jar\fR tool is used to add files, the manifest file is changed by adding sections to it for the new files, but the \f3\&.SF\fR file is not changed\&. A verification is still considered successful when none of the files that were in the JAR file when the signature was generated have been changed since then\&. This happens when the hashes in the non-header sections of the \f3\&.SF\fR file equal the hashes of the corresponding sections in the manifest file\&.
-+.TP 0.4i
-+3\&.
-+Read each file in the JAR file that has an entry in the \f3\&.SF\fR file\&. While reading, compute the file\&'s digest and compare the result with the digest for this file in the manifest section\&. The digests should be the same or verification fails\&.
-+
-+If any serious verification failures occur during the verification process, then the process is stopped and a security exception is thrown\&. The \f3jarsigner\fR command catches and displays the exception\&.
-+.PP
-+\fINote:\fR You should read any addition warnings (or errors if you specified the \f3-strict\fR option), as well as the content of the certificate (by specifying the \f3-verbose\fR and \f3-certs\fR options) to determine if the signature can be trusted\&.
-+.SS MULTIPLE\ SIGNATURES\ FOR\ A\ JAR\ FILE
-+A JAR file can be signed by multiple people by running the \f3jarsigner\fR command on the file multiple times and specifying the alias for a different person each time, as follows:
-+.sp
-+.nf
-+\f3jarsigner myBundle\&.jar susan\fP
-+.fi
-+.nf
-+\f3jarsigner myBundle\&.jar kevin\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When a JAR file is signed multiple times, there are multiple \f3\&.SF\fR and \f3\&.DSA\fR files in the resulting JAR file, one pair for each signature\&. In the previous example, the output JAR file includes files with the following names:
-+.sp
-+.nf
-+\f3SUSAN\&.SF\fP
-+.fi
-+.nf
-+\f3SUSAN\&.DSA\fP
-+.fi
-+.nf
-+\f3KEVIN\&.SF\fP
-+.fi
-+.nf
-+\f3KEVIN\&.DSA\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&.
-+.SH OPTIONS
-+The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards:
-+.TP 0.2i
-+\(bu
-+All option names are preceded by a minus sign (-)\&.
-+.TP 0.2i
-+\(bu
-+The options can be provided in any order\&.
-+.TP 0.2i
-+\(bu
-+Items that are in italics or underlined (option values) represent the actual values that must be supplied\&.
-+.TP 0.2i
-+\(bu
-+The \f3-storepass\fR, \f3-keypass\fR, \f3-sigfile\fR, \f3-sigalg\fR, \f3-digestalg\fR, \f3-signedjar\fR, and TSA-related options are only relevant when signing a JAR file; they are not relevant when verifying a signed JAR file\&. The \f3-keystore\fR option is relevant for signing and verifying a JAR file\&. In addition, aliases are specified when signing and verifying a JAR file\&.
-+.TP
-+-keystore \fIurl\fR
-+.br
-+Specifies the URL that tells the keystore location\&. This defaults to the file \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+
-+A keystore is required when signing\&. You must explicitly specify a keystore when the default keystore does not exist or if you want to use one other than the default\&.
-+
-+A keystore is not required when verifying, but if one is specified or the default exists and the \f3-verbose\fR option was also specified, then additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore\&.
-+
-+The \f3-keystore\fR argument can be a file name and path specification rather than a URL, in which case it is treated the same as a file: URL, for example, the following are equivalent:
-+.sp
-+.nf
-+\f3\-keystore \fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\-keystore file:\fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+If the Sun PKCS #11 provider was configured in the \f3java\&.security\fR security properties file (located in the JRE\&'s \f3$JAVA_HOME/lib/security directory\fR), then the \f3keytool\fR and \f3jarsigner\fR tools can operate on the PKCS #11 token by specifying these options:
-+.sp
-+.nf
-+\f3\-keystore NONE\fP
-+.fi
-+.nf
-+\f3\-storetype PKCS11\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+For example, the following command lists the contents of the configured PKCS#11 token:
-+.sp
-+.nf
-+\f3keytool \-keystore NONE \-storetype PKCS11 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-storetype \fIstoretype\fR
-+.br
-+Specifies the type of keystore to be instantiated\&. The default keystore type is the one that is specified as the value of the \f3keystore\&.type\fR property in the security properties file, which is returned by the static \f3getDefaultType\fR method in \f3java\&.security\&.KeyStore\fR\&.
-+
-+The PIN for a PCKS #11 token can also be specified with the \f3-storepass\fR option\&. If none is specified, then the \f3keytool\fR and \f3jarsigner\fR commands prompt for the token PIN\&. If the token has a protected authentication path (such as a dedicated PIN-pad or a biometric reader), then the \f3-protected\fR option must be specified and no password options can be specified\&.
-+.TP
-+-storepass[:env | :file] \fIargument\fR
-+.br
-+Specifies the password that is required to access the keystore\&. This is only needed when signing (not verifying) a JAR file\&. In that case, if a \f3-storepass\fR option is not provided at the command line, then the user is prompted for the password\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \fIargument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-keypass [:env | :file] \fIargument\fR
-+.br
-+Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line\&. The password is required when using \f3jarsigner\fR to sign a JAR file\&. If no password is provided on the command line, and the required password is different from the store password, then the user is prompted for it\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \f3argument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-sigfile \fIfile\fR
-+.br
-+Specifies the base file name to be used for the generated \f3\&.SF\fR and \f3\&.DSA\fR files\&. For example, if file is \f3DUKESIGN\fR, then the generated \f3\&.SF\fR and \f3\&.DSA\fR files are named \f3DUKESIGN\&.SF\fR and \f3DUKESIGN\&.DSA\fR, and placed in the \f3META-INF\fR directory of the signed JAR file\&.
-+
-+The characters in the file must come from the set \f3a-zA-Z0-9_-\fR\&. Only letters, numbers, underscore, and hyphen characters are allowed\&. All lowercase characters are converted to uppercase for the \f3\&.SF\fR and \f3\&.DSA\fR file names\&.
-+
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to upper case\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not valid in a signature file name, then each such character is converted to an underscore (_) character to form the file name\&.
-+.TP
-+-sigalg \fIalgorithm\fR
-+.br
-+Specifies the name of the signature algorithm to use to sign the JAR file\&.
-+
-+For a list of standard signature algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+This algorithm must be compatible with the private key used to sign the JAR file\&. If this option is not specified, then \f3SHA1withDSA\fR, \f3SHA256withRSA\fR, or \f3SHA256withECDSA\fR are used depending on the type of private key\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-digestalg \fIalgorithm\fR
-+.br
-+Specifies the name of the message digest algorithm to use when digesting the entries of a JAR file\&.
-+
-+For a list of standard message digest algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+If this option is not specified, then \f3SHA256\fR is used\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-certs
-+.br
-+If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&.
-+
-+The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&.
-+.TP
-+-certchain \fIfile\fR
-+.br
-+Specifies the certificate chain to be used when the certificate chain associated with the private key of the keystore entry that is addressed by the alias specified on the command line is not complete\&. This can happen when the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain\&. The file can be a sequence of concatenated X\&.509 certificates, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard\&. See the section Internet RFC 1421 Certificate Encoding Standard in \f3keytool\fR and http://tools\&.ietf\&.org/html/rfc1421\&.
-+.TP
-+-verbose
-+.br
-+When the \f3-verbose\fR option appears on the command line, it indicates verbose mode, which causes \f3jarsigner\fR to output extra information about the progress of the JAR signing or verification\&.
-+.TP
-+-internalsf
-+.br
-+In the past, the \f3\&.DSA\fR (signature block) file generated when a JAR file was signed included a complete encoded copy of the \f3\&.SF\fR file (signature file) also generated\&. This behavior has been changed\&. To reduce the overall size of the output JAR file, the \f3\&.DSA\fR file by default does not contain a copy of the \f3\&.SF\fR file anymore\&. If \f3-internalsf\fR appears on the command line, then the old behavior is utilized\&. This option is useful for testing\&. In practice, do not use the \f3-internalsf\fR option because it incurs higher overhead\&.
-+.TP
-+-sectionsonly
-+.br
-+If the \f3-sectionsonly\fR option appears on the command line, then the \f3\&.SF\fR file (signature file) generated when a JAR file is signed does not include a header that contains a hash of the whole manifest file\&. It contains only the information and hashes related to each individual source file included in the JAR file\&. See Signature File\&.
-+
-+By default, this header is added, as an optimization\&. When the header is present, whenever the JAR file is verified, the verification can first check to see whether the hash in the header matches the hash of the whole manifest file\&. When there is a match, verification proceeds to the next step\&. When there is no match, it is necessary to do a less optimized verification that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See JAR File Verification\&.
-+
-+The \f3-sectionsonly\fR option is primarily used for testing\&. It should not be used other than for testing because using it incurs higher overhead\&.
-+.TP
-+-protected
-+.br
-+Values can be either \f3true\fR or \f3false\fR\&. Specify \f3true\fR when a password must be specified through a protected authentication path such as a dedicated PIN reader\&.
-+.TP
-+-providerClass \fIprovider-class-name\fR
-+.br
-+Used to specify the name of cryptographic service provider\&'s master class file when the service provider is not listed in the \f3java\&.security\fR security properties file\&.
-+
-+Used with the \f3-providerArg ConfigFilePath\fR option, the \f3keytool\fR and \f3jarsigner\fR tools install the provider dynamically and use \fIConfigFilePath\fR for the path to the token configuration file\&. The following example shows a command to list a \f3PKCS #11\fR keystore when the Oracle PKCS #11 provider was not configured in the security properties file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerClass sun\&.security\&.pkcs11\&.SunPKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerArg /mydir1/mydir2/token\&.config \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-providerName \fIproviderName\fR
-+.br
-+If more than one provider was configured in the \f3java\&.security\fR security properties file, then you can use the \f3-providerName\fR option to target a specific provider instance\&. The argument to this option is the name of the provider\&.
-+
-+For the Oracle PKCS #11 provider, \fIproviderName\fR is of the form \f3SunPKCS11-\fR\fITokenName\fR, where \fITokenName\fR is the name suffix that the provider instance has been configured with, as detailed in the configuration attributes table\&. For example, the following command lists the contents of the \f3PKCS #11\fR keystore provider instance with name suffix \f3SmartCard\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerName SunPKCS11\-SmartCard \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-J\fIjavaoption\fR
-+.br
-+Passes through the specified \fIjavaoption\fR string directly to the Java interpreter\&. The \f3jarsigner\fR command is a wrapper around the interpreter\&. This option should not contain any spaces\&. It is useful for adjusting the execution environment or memory usage\&. For a list of possible interpreter options, type \f3java -h\fR or \f3java -X\fR at the command line\&.
-+.TP
-+-tsa \fIurl\fR
-+.br
-+If \f3-tsa http://example\&.tsa\&.url\fR appears on the command line when signing a JAR file then a time stamp is generated for the signature\&. The URL, \f3http://example\&.tsa\&.url\fR, identifies the location of the Time Stamping Authority (TSA) and overrides any URL found with the \f3-tsacert\fR option\&. The \f3-tsa\fR option does not require the TSA public key certificate to be present in the keystore\&.
-+
-+To generate the time stamp, \f3jarsigner\fR communicates with the TSA with the Time-Stamp Protocol (TSP) defined in RFC 3161\&. When successful, the time stamp token returned by the TSA is stored with the signature in the signature block file\&.
-+.TP
-+-tsacert \fIalias\fR
-+.br
-+When \f3-tsacert alias\fR appears on the command line when signing a JAR file, a time stamp is generated for the signature\&. The alias identifies the TSA public key certificate in the keystore that is in effect\&. The entry\&'s certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA\&.
-+
-+The TSA public key certificate must be present in the keystore when using the \f3-tsacert\fR option\&.
-+.TP
-+-tsapolicyid \fIpolicyid\fR
-+.br
-+Specifies the object identifier (OID) that identifies the policy ID to be sent to the TSA server\&. If this option is not specified, no policy ID is sent and the TSA server will choose a default policy ID\&.
-+
-+Object identifiers are defined by X\&.696, which is an ITU Telecommunication Standardization Sector (ITU-T) standard\&. These identifiers are typically period-separated sets of non-negative digits like \f31\&.2\&.3\&.4\fR, for example\&.
-+.TP
-+-altsigner \fIclass\fR
-+.br
-+This option specifies an alternative signing mechanism\&. The fully qualified class name identifies a class file that extends the \f3com\&.sun\&.jarsigner\&.ContentSigner\fR abstract class\&. The path to this class file is defined by the \f3-altsignerpath\fR option\&. If the \f3-altsigner\fR option is used, then the \f3jarsigner\fR command uses the signing mechanism provided by the specified class\&. Otherwise, the \f3jarsigner\fR command uses its default signing mechanism\&.
-+
-+For example, to use the signing mechanism provided by a class named \f3com\&.sun\&.sun\&.jarsigner\&.AuthSigner\fR, use the jarsigner option \f3-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fR\&.
-+.TP
-+-altsignerpath \fIclasspathlist\fR
-+.br
-+Specifies the path to the class file and any JAR file it depends on\&. The class file name is specified with the \f3-altsigner\fR option\&. If the class file is in a JAR file, then this option specifies the path to that JAR file\&.
-+
-+An absolute path or a path relative to the current directory can be specified\&. If \fIclasspathlist\fR contains multiple paths or JAR files, then they should be separated with a colon (:) on Oracle Solaris and a semicolon (;) on Windows\&. This option is not necessary when the class is already in the search path\&.
-+
-+The following example shows how to specify the path to a JAR file that contains the class file\&. The JAR file name is included\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/lib/authsigner\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+The following example shows how to specify the path to the JAR file that contains the class file\&. The JAR file name is omitted\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-strict
-+.br
-+During the signing or verifying process, the command may issue warning messages\&. If you specify this option, the exit code of the tool reflects the severe warning messages that this command found\&. See Errors and Warnings\&.
-+.TP
-+-verbose \fIsuboptions\fR
-+.br
-+For the verifying process, the \f3-verbose\fR option takes suboptions to determine how much information is shown\&. If the \f3-certs\fR option is also specified, then the default mode (or suboption \f3all\fR) displays each entry as it is being processed, and after that, the certificate information for each signer of the JAR file\&. If the \f3-certs\fR and the \f3-verbose:grouped\fR suboptions are specified, then entries with the same signer info are grouped and displayed together with their certificate information\&. If \f3-certs\fR and the \f3-verbose:summary\fR suboptions are specified, then entries with the same signer information are grouped and displayed together with their certificate information\&. Details about each entry are summarized and displayed as \fIone entry (and more)\fR\&. See Examples\&.
-+.SH ERRORS\ AND\ WARNINGS
-+During the signing or verifying process, the \f3jarsigner\fR command may issue various errors or warnings\&.
-+.PP
-+If there is a failure, the \f3jarsigner\fR command exits with code 1\&. If there is no failure, but there are one or more severe warnings, the \f3jarsigner\fR command exits with code 0 when the \f3-strict\fR option is \fInot\fR specified, or exits with the OR-value of the warning codes when the \f3-strict\fR is specified\&. If there is only informational warnings or no warning at all, the command always exits with code 0\&.
-+.PP
-+For example, if a certificate used to sign an entry is expired and has a KeyUsage extension that does not allow it to sign a file, the \f3jarsigner\fR command exits with code 12 (=4+8) when the \f3-strict\fR option is specified\&.
-+.PP
-+\fINote:\fR Exit codes are reused because only the values from 0 to 255 are legal on Unix-based operating systems\&.
-+.PP
-+The following sections describes the names, codes, and descriptions of the errors and warnings that the \f3jarsigner\fR command can issue\&.
-+.SS FAILURE
-+Reasons why the \f3jarsigner\fR command fails include (but are not limited to) a command line parsing error, the inability to find a keypair to sign the JAR file, or the verification of a signed JAR fails\&.
-+.TP
-+failure
-+Code 1\&. The signing or verifying fails\&.
-+.SS SEVERE\ WARNINGS
-+\fINote:\fR Severe warnings are reported as errors if you specify the \f3-strict\fR option\&.
-+.PP
-+Reasons why the \f3jarsigner\fR command issues a severe warning include the certificate used to sign the JAR file has an error or the signed JAR file has other problems\&.
-+.TP
-+hasExpiredCert
-+Code 4\&. This jar contains entries whose signer certificate has expired\&.
-+.TP
-+notYetValidCert
-+Code 4\&. This jar contains entries whose signer certificate is not yet valid\&.
-+.TP
-+chainNotValidated
-+Code 4\&. This jar contains entries whose certificate chain cannot be correctly validated\&.
-+.TP
-+badKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s KeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badExtendedKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s ExtendedKeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badNetscapeCertType
-+Code 8\&. This jar contains entries whose signer certificate\&'s NetscapeCertType extension doesn\&'t allow code signing\&.
-+.TP
-+hasUnsignedEntry
-+Code 16\&. This jar contains unsigned entries which have not been integrity-checked\&.
-+.TP
-+notSignedByAlias
-+Code 32\&. This jar contains signed entries which are not signed by the specified alias(es)\&.
-+.TP
-+aliasNotInStore
-+Code 32\&. This jar contains signed entries that are not signed by alias in this keystore\&.
-+.SS INFORMATIONAL\ WARNINGS
-+Informational warnings include those that are not errors but regarded as bad practice\&. They do not have a code\&.
-+.TP
-+hasExpiringCert
-+This jar contains entries whose signer certificate will expire within six months\&.
-+.TP
-+noTimestamp
-+This jar contains signatures that does not include a timestamp\&. Without a timestamp, users may not be able to validate this JAR file after the signer certificate\&'s expiration date (\f3YYYY-MM-DD\fR) or after any future revocation date\&.
-+.SH EXAMPLES
-+.SS SIGN\ A\ JAR\ FILE
-+Use the following command to sign bundle\&.jar with the private key of a user whose keystore alias is \f3jane\fR in a keystore named \f3mystore\fR in the \f3working\fR directory and name the signed JAR file \f3sbundle\&.jar\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password>\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+There is no \f3-sigfile\fR specified in the previous command so the generated \f3\&.SF\fR and \f3\&.DSA\fR files to be placed in the signed JAR file have default names based on the alias name\&. They are named \f3JANE\&.SF\fR and \f3JANE\&.DSA\fR\&.
-+.PP
-+If you want to be prompted for the store password and the private key password, then you could shorten the previous command to the following:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the keystore is the default keystore (\&.keystore in your home directory), then you do not need to specify a keystore, as follows:
-+.sp
-+.nf
-+\f3jarsigner \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If you want the signed JAR file to overwrite the input JAR file (bundle\&.jar), then you do not need to specify a \f3-signedjar\fR option, as follows:
-+.sp
-+.nf
-+\f3jarsigner bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFY\ A\ SIGNED\ JAR\ FILE
-+To verify a signed JAR file to ensure that the signature is valid and the JAR file was not been tampered with, use a command such as the following:
-+.sp
-+.nf
-+\f3jarsigner \-verify sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When the verification is successful, \f3jar verified\fR is displayed\&. Otherwise, an error message is displayed\&. You can get more information when you use the \f3-verbose\fR option\&. A sample use of \f3jarsigner\fR with the\f3-verbose\fR option follows:
-+.sp
-+.nf
-+\f3jarsigner \-verify \-verbose sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx\&.class\fP
-+.fi
-+.nf
-+\f3 smk 849 Fri Sep 26 16:12:46 PDT 1997 test\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFICATION\ WITH\ CERTIFICATE\ INFORMATION
-+If you specify the \f3-certs\fR option with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. The information includes the certificate type, the signer distinguished name information (when it is an X\&.509 certificate), and in parentheses, the keystore alias for the signer when the public key certificate in the JAR file matches the one in a keystore entry, for example:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.SF\fP
-+.fi
-+.nf
-+\f3 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Test Group, OU=Java Software, O=Oracle, L=CUP, S=CA, C=US (javatest)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&.
-+.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS
-+If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&.
-+.PP
-+When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example:
-+.sp
-+.nf
-+\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3 i = at least one certificate was found in identity scope\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&.
-+.SH JDK\ 1\&.1\ COMPATIBILITY
-+The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&.
-+.PP
-+The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following:
-+.TP 0.2i
-+\(bu
-+It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&.
-+.SS UNSIGNED\ JARS
-+Unsigned JARs have the default privileges that are granted to all code\&.
-+.SS SIGNED\ JARS
-+Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&.
-+.PP
-+Default Privileges Granted to All Code
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 and 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Default Privileges and Policy File Privileges Granted
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 2 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+All Privileges Granted
-+
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Notes Regarding Privileges of Signed JARs
-+.TP 0.4i
-+1\&.
-+If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&.
-+.TP 0.4i
-+2\&.
-+The policy file/keystore combination has precedence over a trusted identity in the identity database\&.
-+.TP 0.4i
-+3\&.
-+Untrusted identities are ignored in the Java platform\&.
-+.SH SEE\ ALSO
-+.TP 0.2i
-+\(bu
-+\f3jar\fR
-+.TP 0.2i
-+\(bu
-+\f3keytool\fR
-+.TP 0.2i
-+\(bu
-+Trail: Security Features in Java SE at http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html
-+.RE
-+.br
-+'pl 8.5i
-+'bp
---- jdk/src/bsd/doc/man/javac.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/javac.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH javac 1 "10 May 2011"
-+.TH javac 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -42,17 +42,17 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options.
-+options
-+Command\-line options.
- .TP 3
--sourcefiles
--One or more source files to be compiled (such as MyClass.java).
-+sourcefiles
-+One or more source files to be compiled (such as MyClass.java).
- .TP 3
--classes
--One or more classes to be processed for annotations (such as MyPackage.MyClass).
-+classes
-+One or more classes to be processed for annotations (such as MyPackage.MyClass).
- .TP 3
--@argfiles
--One or more files that lists options and source files. The \f2\-J\fP options are not allowed in these files.
-+@argfiles
-+One or more files that lists options and source files. The \f2\-J\fP options are not allowed in these files.
- .RE
-
- .LP
-@@ -67,10 +67,10 @@
- .RS 3
- .TP 2
- o
--For a small number of source files, simply list the file names on the command line.
-+For a small number of source files, simply list the file names on the command line.
- .TP 2
- o
--For a large number of source files, list the file names in a file, separated by blanks or line breaks. Then use the list file name on the \f3javac\fP command line, preceded by an \f3@\fP character.
-+For a large number of source files, list the file names in a file, separated by blanks or line breaks. Then use the list file name on the \f3javac\fP command line, preceded by an \f3@\fP character.
- .RE
-
- .LP
-@@ -91,150 +91,150 @@
- .LP
- The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP.
- .LP
--.SS
-+.SS
- Standard Options
- .LP
- .RS 3
- .TP 3
--\-Akey[=value]
--Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".".
-+\-Akey[=value]
-+Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".".
- .TP 3
--\-cp path or \-classpath path
-+\-cp path or \-classpath path
- Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details.
- .br
- .br
- >If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files.
- .br
- .br
--If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors.
-+If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors.
- .TP 3
--\-Djava.ext.dirs=directories
--Override the location of installed extensions.
-+\-Djava.ext.dirs=directories
-+Override the location of installed extensions.
- .TP 3
--\-Djava.endorsed.dirs=directories
--Override the location of endorsed standards path.
-+\-Djava.endorsed.dirs=directories
-+Override the location of endorsed standards path.
- .TP 3
--\-d directory
-+\-d directory
- Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP.
- .br
- .br
- If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated.
- .br
- .br
--\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path.
-+\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path.
- .TP 3
--\-deprecation
--Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP.
-+\-deprecation
-+Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP.
- .TP 3
--\-encoding encoding
--Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
-+\-encoding encoding
-+Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
- .TP 3
--\-endorseddirs directories
--Override the location of endorsed standards path.
-+\-endorseddirs directories
-+Override the location of endorsed standards path.
- .TP 3
--\-extdirs directories
-+\-extdirs directories
- Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path.
- .br
- .br
--If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information.
-+If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information.
- .TP 3
--\-g
--Generate all debugging information, including local variables. By default, only line number and source file information is generated.
-+\-g
-+Generate all debugging information, including local variables. By default, only line number and source file information is generated.
- .TP 3
--\-g:none
--Do not generate any debugging information.
-+\-g:none
-+Do not generate any debugging information.
- .TP 3
--\-g:{keyword list}
--Generate only some kinds of debugging information, specified by a comma separated list of keywords. Valid keywords are:
-+\-g:{keyword list}
-+Generate only some kinds of debugging information, specified by a comma separated list of keywords. Valid keywords are:
- .RS 3
- .TP 3
--source
--Source file debugging information
-+source
-+Source file debugging information
- .TP 3
--lines
--Line number debugging information
-+lines
-+Line number debugging information
- .TP 3
--vars
--Local variable debugging information
-+vars
-+Local variable debugging information
- .RE
- .TP 3
--\-help
--Print a synopsis of standard options.
-+\-help
-+Print a synopsis of standard options.
- .TP 3
--\-implicit:{class,none}
--Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
-+\-implicit:{class,none}
-+Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types.
- .TP 3
--\-Joption
-+\-Joption
- Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
- .br
- .br
--\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
-+\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
- .TP 3
--\-nowarn
--Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP.
-+\-nowarn
-+Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP.
- .TP 3
--\-proc: {none,only}
--Controls whether annotation processing and/or compilation is done. \f3\-proc:none\fP means that compilation takes place without annotation processing. \f3\-proc:only\fP means that only annotation processing is done, without any subsequent compilation.
-+\-proc: {none,only}
-+Controls whether annotation processing and/or compilation is done. \f3\-proc:none\fP means that compilation takes place without annotation processing. \f3\-proc:only\fP means that only annotation processing is done, without any subsequent compilation.
- .TP 3
--\-processor class1[,class2,class3...]
--Names of the annotation processors to run. This bypasses the default discovery process.
-+\-processor class1[,class2,class3...]
-+Names of the annotation processors to run. This bypasses the default discovery process.
- .TP 3
--\-processorpath path
--Specify where to find annotation processors; if this option is not used, the class path will be searched for processors.
-+\-processorpath path
-+Specify where to find annotation processors; if this option is not used, the class path will be searched for processors.
- .TP 3
--\-s dir
--Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP.
-+\-s dir
-+Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP.
- .TP 3
--\-source release
--Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
-+\-source release
-+Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
- .RS 3
- .TP 3
--1.3
--The compiler does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
-+1.3
-+The compiler does \f2not\fP support assertions, generics, or other language features introduced after Java SE 1.3.
- .TP 3
--1.4
--The compiler accepts code containing assertions, which were introduced in JDK 1.4.
-+1.4
-+The compiler accepts code containing assertions, which were introduced in Java SE 1.4.
- .TP 3
--1.5
--The compiler accepts code containing generics and other language features introduced in JDK 5.
-+1.5
-+The compiler accepts code containing generics and other language features introduced in Java SE 5.
- .TP 3
--5
--Synonym for 1.5.
-+5
-+Synonym for 1.5.
- .TP 3
--1.6
--This is the default value. No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors, instead of warnings, as previously.
-+1.6
-+No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors instead of warnings as in previous releases of Java SE.
- .TP 3
--6
--Synonym for 1.6.
-+6
-+Synonym for 1.6.
- .TP 3
--1.7
--The compiler accepts code with features introduced in JDK 7.
-+1.7
-+This is the default value. The compiler accepts code with features introduced in Java SE 7.
- .TP 3
--7
--Synonym for 1.7.
-+7
-+Synonym for 1.7.
- .RE
- .TP 3
--\-sourcepath sourcepath
-+\-sourcepath sourcepath
- Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name.
- .br
- .br
--\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types.
-+\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types.
- .TP 3
--\-verbose
--Verbose output. This includes information about each class loaded and each source file compiled.
-+\-verbose
-+Verbose output. This includes information about each class loaded and each source file compiled.
- .TP 3
--\-version
--Print version information.
-+\-version
-+Print version information.
- .TP 3
--\-Werror
--Terminate compilation if warnings occur.
-+\-Werror
-+Terminate compilation if warnings occur.
- .TP 3
--\-X
--Display information about non\-standard options and exit.
-+\-X
-+Display information about non\-standard options and exit.
- .RE
-
- .LP
--.SS
-+.SS
- Cross\-Compilation Options
- .LP
- .LP
-@@ -242,87 +242,92 @@
- .LP
- .RS 3
- .TP 3
--\-target version
--Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
--.br
--.br
--The default for \f3\-target\fP depends on the value of \f3\-source\fP:
-+\-target version
-+Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP, \f31.2\fP, \f31.3\fP, \f31.4\fP, \f31.5\fP (also \f35\fP), \f31.6\fP (also \f36\fP), and \f31.7\fP (also \f37\fP).
-+.LP
-+The default for \f3\-target\fP depends on the value of \f3\-source\fP:
- .RS 3
- .TP 2
- o
--If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP
-+If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP
-+.TP 2
-+o
-+If \-source is \f31.2\fP, the value of \-target is \f31.4\fP
- .TP 2
- o
--If \-source is \f31.2\fP, the value of \-target is \f31.4\fP
-+If \-source is \f31.3\fP, the value of \-target is \f31.4\fP
- .TP 2
- o
--If \-source is \f31.3\fP, the value of \-target is \f31.4\fP
-+If \-source is \f31.5\fP, the value of \-target is \f31.7\fP
- .TP 2
- o
--For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP.
-+If \-source is \f31.6\fP, the value of \-target is \f31.7\fP
-+.TP 2
-+o
-+For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP.
- .RE
- .TP 3
--\-bootclasspath bootclasspath
--Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives.
-+\-bootclasspath bootclasspath
-+Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives.
- .RE
-
- .LP
--.SS
-+.SS
- Non\-Standard Options
- .LP
- .RS 3
- .TP 3
--\-Xbootclasspath/p:path
--Prepend to the bootstrap class path.
-+\-Xbootclasspath/p:path
-+Prepend to the bootstrap class path.
- .TP 3
--\-Xbootclasspath/a:path
--Append to the bootstrap class path.
-+\-Xbootclasspath/a:path
-+Append to the bootstrap class path.
- .TP 3
--\-Xbootclasspath/:path
--Override location of bootstrap class files.
-+\-Xbootclasspath/:path
-+Override location of bootstrap class files.
- .TP 3
--\-Xlint
--Enable all recommended warnings. In this release, enabling all available warnings is recommended.
-+\-Xlint
-+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
- .TP 3
--\-Xlint:all
--Enable all recommended warnings. In this release, enabling all available warnings is recommended.
-+\-Xlint:all
-+Enable all recommended warnings. In this release, enabling all available warnings is recommended.
- .TP 3
--\-Xlint:none
--Disable all warnings.
-+\-Xlint:none
-+Disable all warnings.
- .TP 3
--\-Xlint:name
--Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option.
-+\-Xlint:name
-+Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option.
- .TP 3
--\-Xlint:\-name
--Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option.
-+\-Xlint:\-name
-+Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option.
- .TP 3
--\-Xmaxerrs number
--Set the maximum number of errors to print.
-+\-Xmaxerrs number
-+Set the maximum number of errors to print.
- .TP 3
--\-Xmaxwarns number
--Set the maximum number of warnings to print.
-+\-Xmaxwarns number
-+Set the maximum number of warnings to print.
- .TP 3
--\-Xstdout filename
--Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP.
-+\-Xstdout filename
-+Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP.
- .TP 3
--\-Xprefer:{newer,source}
--Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
-+\-Xprefer:{newer,source}
-+Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
- .TP 3
--\-Xpkginfo:{always,legacy,nonempty}
--Specify handling of package\-info files
-+\-Xpkginfo:{always,legacy,nonempty}
-+Specify handling of package\-info files
- .TP 3
--\-Xprint
--Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change.
-+\-Xprint
-+Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change.
- .TP 3
--\-XprintProcessorInfo
--Print information about which annotations a processor is asked to process.
-+\-XprintProcessorInfo
-+Print information about which annotations a processor is asked to process.
- .TP 3
--\-XprintRounds
--Print information about initial and subsequent annotation processing rounds.
-+\-XprintRounds
-+Print information about initial and subsequent annotation processing rounds.
- .RE
-
- .LP
--.SS
-+.SS
- Warnings That Can Be Enabled or Disabled with \-Xlint Option
- .LP
- .LP
-@@ -330,8 +335,8 @@
- .LP
- .RS 3
- .TP 3
--cast
--Warn about unnecessary and redundant casts. For example:
-+cast
-+Warn about unnecessary and redundant casts. For example:
- .nf
- \f3
- .fl
-@@ -340,11 +345,11 @@
- \fP
- .fi
- .TP 3
--classfile
--Warn about issues related to classfile contents.
-+classfile
-+Warn about issues related to classfile contents.
- .TP 3
--deprecation
--Warn about use of deprecated items. For example:
-+deprecation
-+Warn about use of deprecated items. For example:
- .nf
- \f3
- .fl
-@@ -354,10 +359,10 @@
- .fl
- \fP
- .fi
--The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1.
-+The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1.
- .TP 3
--dep\-ann
--Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example:
-+dep\-ann
-+Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example:
- .nf
- \f3
- .fl
-@@ -378,8 +383,8 @@
- \fP
- .fi
- .TP 3
--divzero
--Warn about division by constant integer 0. For example:
-+divzero
-+Warn about division by constant integer 0. For example:
- .nf
- \f3
- .fl
-@@ -388,8 +393,8 @@
- \fP
- .fi
- .TP 3
--empty
--Warn about empty statements after \f2if\fP statements. For example:
-+empty
-+Warn about empty statements after \f2if\fP statements. For example:
- .nf
- \f3
- .fl
-@@ -406,8 +411,8 @@
- \fP
- .fi
- .TP 3
--fallthrough
--Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
-+fallthrough
-+Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement:
- .nf
- \f3
- .fl
-@@ -427,10 +432,10 @@
- .fl
- \fP
- .fi
--If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
-+If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question.
- .TP 3
--finally
--Warn about \f2finally\fP clauses that cannot complete normally. For example:
-+finally
-+Warn about \f2finally\fP clauses that cannot complete normally. For example:
- .nf
- \f3
- .fl
-@@ -456,13 +461,13 @@
- .fl
- \fP
- .fi
--The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method.
-+The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method.
- .TP 3
--options
--Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning.
-+options
-+Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning.
- .TP 3
--overrides
--Warn about issues regarding method overrides. For example, consider the following two classes:
-+overrides
-+Warn about issues regarding method overrides. For example, consider the following two classes:
- .nf
- \f3
- .fl
-@@ -493,10 +498,10 @@
- \f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP
- .br
- .br
--When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles.
-+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles.
- .TP 3
--path
--Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example:
-+path
-+Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example:
- .nf
- \f3
- .fl
-@@ -505,11 +510,11 @@
- \fP
- .fi
- .TP 3
--processing
-+processing
- Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor:
- .br
- .br
--\f3Source file \fP\f4AnnoProc.java\fP:
-+\f3Source file \fP\f4AnnoProc.java\fP:
- .nf
- \f3
- .fl
-@@ -545,7 +550,7 @@
- .fl
- \fP
- .fi
--\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP
-+\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP
- .nf
- \f3
- .fl
-@@ -559,15 +564,14 @@
- .fl
- \fP
- .fi
--The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP:
-+The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP:
- .nf
- \f3
- .fl
--% javac AnnoProc.java
-+% \fP\f3javac AnnoProc.java\fP
- .fl
--% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java
-+% \f3javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java\fP
- .fl
--\fP
- .fi
- When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning:
- .br
-@@ -575,10 +579,10 @@
- \f2warning: [processing] No processor claimed any of these annotations: Anno\fP
- .br
- .br
--To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP.
-+To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP.
- .TP 3
--rawtypes
--Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning:
-+rawtypes
-+Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning:
- .nf
- \f3
- .fl
-@@ -586,7 +590,7 @@
- .fl
- \fP
- .fi
--The following does not generate a \f2rawtypes\fP warning:
-+The following does not generate a \f2rawtypes\fP warning:
- .nf
- \f3
- .fl
-@@ -594,10 +598,10 @@
- .fl
- \fP
- .fi
--\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface.
-+\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface.
- .TP 3
--serial
--Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example:
-+serial
-+Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example:
- .nf
- \f3
- .fl
-@@ -633,10 +637,10 @@
- \f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP
- .br
- .br
--If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value.
-+If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value.
- .TP 3
--static
--Warn about issues relating to use of statics. For example:
-+static
-+Warn about issues relating to use of statics. For example:
- .nf
- \f3
- .fl
-@@ -650,7 +654,7 @@
- .fl
- \fP
- .fi
--The compiler generates the following warning:
-+The compiler generates the following warning:
- .nf
- \f3
- .fl
-@@ -658,7 +662,7 @@
- .fl
- \fP
- .fi
--To resolve this issue, you can call the static method \f2m1\fP as follows:
-+To resolve this issue, you can call the static method \f2m1\fP as follows:
- .nf
- \f3
- .fl
-@@ -666,10 +670,10 @@
- .fl
- \fP
- .fi
--Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP.
-+Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP.
- .TP 3
--try
--Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used:
-+try
-+Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used:
- .nf
- \f3
- .fl
-@@ -682,8 +686,8 @@
- \fP
- .fi
- .TP 3
--unchecked
--Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example:
-+unchecked
-+Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example:
- .nf
- \f3
- .fl
-@@ -699,10 +703,10 @@
- The variable \f2ls\fP has the parameterized type \f2List<String>\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List<String>\fP type; it does not. Consequently, heap pollution occurs.
- .br
- .br
--In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP.
-+In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP.
- .TP 3
--varargs
--Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example:
-+varargs
-+Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example:
- .nf
- \f3
- .fl
-@@ -722,7 +726,7 @@
- .fl
- \fP
- .fi
--The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP:
-+The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP:
- .nf
- \f3
- .fl
-@@ -730,7 +734,7 @@
- .fl
- \fP
- .fi
--When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution.
-+When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution.
- .RE
-
- .LP
-@@ -748,7 +752,7 @@
- .LP
- When executing javac, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javac encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list.
- .LP
--.SS
-+.SS
- Example \- Single Arg File
- .LP
- .LP
-@@ -765,7 +769,7 @@
- .LP
- This argument file could contain the contents of both files shown in the next example.
- .LP
--.SS
-+.SS
- Example \- Two Arg Files
- .LP
- .LP
-@@ -820,7 +824,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Example \- Arg Files with Paths
- .LP
- .LP
-@@ -842,7 +846,7 @@
- .LP
- The API for annotation processors is defined in the \f2javax.annotation.processing\fP and \f2javax.lang.model\fP packages and subpackages.
- .LP
--.SS
-+.SS
- Overview of annotation processing
- .LP
- .LP
-@@ -857,7 +861,7 @@
- .LP
- After a round occurs where no new source files are generated, the annotation processors will be invoked one last time, to give them a chance to complete any work they may need to do. Finally, unless the \f3\-proc:only\fP option is used, the compiler will compile the original and all the generated source files.
- .LP
--.SS
-+.SS
- Implicitly loaded source files
- .LP
- .LP
-@@ -894,7 +898,7 @@
- .LP
- \f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package.
- .LP
--.SS
-+.SS
- Example
- .LP
- .LP
-@@ -917,7 +921,7 @@
- .LP
- You can use other methods on the \f2javax.tools.JavaCompiler\fP interface to handle diagnostics, control where files are read from and written to, and so on.
- .LP
--.SS
-+.SS
- Old Interface
- .LP
- .LP
-@@ -951,7 +955,7 @@
- .LP
- .SH "EXAMPLES"
- .LP
--.SS
-+.SS
- Compiling a Simple Program
- .LP
- .LP
-@@ -1005,7 +1009,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Compiling Multiple Source Files
- .LP
- .LP
-@@ -1033,7 +1037,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Specifying a User Class Path
- .LP
- .LP
-@@ -1068,7 +1072,7 @@
- .nf
- \f3
- .fl
--% \fP\f3javac \-classpath /examples:/lib/Banners.jar \\
-+% \fP\f3javac \-classpath /examples:/lib/Banners.jar \\
- .fl
- /examples/greetings/Hi.java\fP
- .fl
-@@ -1086,7 +1090,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Separating Source Files and Class Files
- .LP
- .LP
-@@ -1113,7 +1117,7 @@
- .fl
- % \f3ls classes\fP
- .fl
--% \f3javac \-sourcepath src \-classpath classes:lib/Banners.jar \\
-+% \f3javac \-sourcepath src \-classpath classes:lib/Banners.jar \\
- .fl
- src/farewells/GoodBye.java \-d classes\fP
- .fl
-@@ -1131,16 +1135,16 @@
- .LP
- \f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option.
- .LP
--.SS
-+.SS
- Cross\-Compilation Example
- .LP
- .LP
--Here we use \f3javac\fP to compile code that will run on a 1.6 VM.
-+The following example uses \f3javac\fP to compile code that will run on a 1.6 VM.
- .LP
- .nf
- \f3
- .fl
--% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\
-+% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\
- .fl
- \-extdirs "" OldCode.java\fP
- .fl
-@@ -1174,32 +1178,32 @@
- .na
- \f2The javac Guide\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html
- .TP 2
- o
--java(1) \- the Java Application Launcher
-+java(1) \- the Java Application Launcher
- .TP 2
- o
--jdb(1) \- Java Application Debugger
-+jdb(1) \- Java Application Debugger
- .TP 2
- o
--javah(1) \- C Header and Stub File Generator
-+javah(1) \- C Header and Stub File Generator
- .TP 2
- o
--javap(1) \- Class File Disassembler
-+javap(1) \- Class File Disassembler
- .TP 2
- o
--javadoc(1) \- API Documentation Generator
-+javadoc(1) \- API Documentation Generator
- .TP 2
- o
--jar(1) \- JAR Archive Tool
-+jar(1) \- JAR Archive Tool
- .TP 2
- o
- .na
- \f2The Java Extensions Framework\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/javadoc.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/javadoc.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH javadoc 1 "10 May 2011"
-+.TH javadoc 1 "16 Mar 2012"
- .SH "Name"
- javadoc \- The Java API Documentation Generator
- .LP
-@@ -31,68 +31,68 @@
- Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process.
- .RS 3
- .TP 3
--options
--Command\-line options, as specified in this document. To see a typical use of javadoc options, see Real\-World Example.
-+options
-+Command\-line options, as specified in this document. To see a typical use of javadoc options, see Real\-World Example.
- .TP 3
--packagenames
--A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages
-+packagenames
-+A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages
- .TP 3
--sourcefilenames
--A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
-+sourcefilenames
-+A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
- .TP 3
--\-subpackages pkg1:pkg2:...
--Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames.
-+\-subpackages pkg1:pkg2:...
-+Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames.
- .TP 3
--@argfiles
--One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.
-+@argfiles
-+One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.
- .RE
- .SH "DESCRIPTION"
- .LP
- The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files.
- .LP
- You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next.
--.SS
-+.SS
- Processing of source files
- .LP
- The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements:
- .RS 3
- .TP 2
- o
--Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters)
-+Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters)
- .TP 2
- o
--Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots)
-+Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots)
- .TP 2
- o
--Its package statement contains the legal package name (specified in the previous bullet)
-+Its package statement contains the legal package name (specified in the previous bullet)
- .RE
- .LP
- \f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places:
- .RS 3
- .TP 2
- o
--Declarations (return types, argument types, field types)
-+Declarations (return types, argument types, field types)
- .TP 2
- o
--"See Also" sections generated from \f2@see\fP tags
-+"See Also" sections generated from \f2@see\fP tags
- .TP 2
- o
--In\-line text generated from \f2{@link}\fP tags
-+In\-line text generated from \f2{@link}\fP tags
- .TP 2
- o
--Exception names generated from \f2@throws\fP tags
-+Exception names generated from \f2@throws\fP tags
- .TP 2
- o
--"Specified by" links to members in interfaces and "Overrides" links to members in classes
-+"Specified by" links to members in interfaces and "Overrides" links to members in classes
- .TP 2
- o
--Summary tables listing packages, classes and members
-+Summary tables listing packages, classes and members
- .TP 2
- o
--Package and class inheritance trees
-+Package and class inheritance trees
- .TP 2
- o
--The index
-+The index
- .RE
- .LP
- You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options.
-@@ -107,12 +107,12 @@
- .LP
- In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly.
- .LP
--When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see
-+When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see
- .na
- \f2How Classes Are Found\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
--.SS
-+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
-+.SS
- Javadoc Doclets
- .LP
- You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations:
-@@ -122,14 +122,14 @@
- .na
- \f2Javadoc Doclets\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html
- .TP 2
- o
--The \f2\-doclet\fP command\-line option
-+The \f2\-doclet\fP command\-line option
- .RE
- .LP
- When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section.
--.SS
-+.SS
- Related Documentation and Doclets
- .RS 3
- .TP 2
-@@ -137,89 +137,89 @@
- .na
- \f2Javadoc Enhancements\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc.
- .TP 2
- o
- .na
- \f2Javadoc FAQ\fP @
- .fi
--http://java.sun.com/j2se/javadoc/faq/index.html for answers to common questions, information about Javadoc\-related tools, and workarounds for bugs.
-+http://java.sun.com/j2se/javadoc/faq/index.html for answers to common questions, information about Javadoc\-related tools, and workarounds for bugs.
- .TP 2
- o
- .na
- \f2How to Write Doc Comments for Javadoc\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments.
- .TP 2
- o
- .na
- \f2Requirements for Writing API Specifications\fP @
- .fi
--http://java.sun.com/j2se/javadoc/writingapispecs/index.html \- Standard requirements used when writing the Java SE Platform Specification. It can be useful whether you are writing API specifications in source file documentation comments or in other formats. It covers requirements for packages, classes, interfaces, fields and methods to satisfy testable assertions.
-+http://java.sun.com/j2se/javadoc/writingapispecs/index.html \- Standard requirements used when writing the Java SE Platform Specification. It can be useful whether you are writing API specifications in source file documentation comments or in other formats. It covers requirements for packages, classes, interfaces, fields and methods to satisfy testable assertions.
- .TP 2
- o
- .na
- \f2Documentation Comment Specification\fP @
- .fi
--http://java.sun.com/docs/books/jls/first_edition/html/18.doc.html \- The original specification on documentation comments, Chapter 18, Documentation Comments, in the \f2Java Language Specification\fP, First Edition, by James Gosling, Bill Joy, and Guy Steele. (This chapter was removed from the second edition.)
-+http://java.sun.com/docs/books/jls/first_edition/html/18.doc.html \- The original specification on documentation comments, Chapter 18, Documentation Comments, in the \f2Java Language Specification\fP, First Edition, by James Gosling, Bill Joy, and Guy Steele. (This chapter was removed from the second edition.)
- .TP 2
- o
- .na
- \f2DocCheck Doclet\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities.
- .TP 2
- o
- .na
- \f2MIF Doclet\fP @
- .fi
--http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
-+http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format.
- .RE
--.SS
-+.SS
- Terminology
- .LP
- The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool:
- .RS 3
- .TP 3
--generated document
--The document generated by the javadoc tool from the doc comments in Java source code. The default generated document is in HTML and is created by the standard doclet.
-+generated document
-+The document generated by the javadoc tool from the doc comments in Java source code. The default generated document is in HTML and is created by the standard doclet.
- .LP
- .TP 3
--name
--A name of a program element written in the Java Language \-\- that is, the name of a package, class, interface, field, constructor or method. A name can be fully\-qualified, such as \f2java.lang.String.equals(java.lang.Object)\fP, or partially\-qualified, such as \f2equals(Object)\fP.
-+name
-+A name of a program element written in the Java Language \-\- that is, the name of a package, class, interface, field, constructor or method. A name can be fully\-qualified, such as \f2java.lang.String.equals(java.lang.Object)\fP, or partially\-qualified, such as \f2equals(Object)\fP.
- .LP
- .TP 3
--documented classes
--The classes and interfaces for which detailed documentation is generated during a javadoc run. To be documented, the source files must be available, their source filenames or package names must be passed into the javadoc command, and they must not be filtered out by their access modifier (public, protected, package\-private or private). We also refer to these as the classes included in the javadoc output, or the \f2included classes\fP.
-+documented classes
-+The classes and interfaces for which detailed documentation is generated during a javadoc run. To be documented, the source files must be available, their source filenames or package names must be passed into the javadoc command, and they must not be filtered out by their access modifier (public, protected, package\-private or private). We also refer to these as the classes included in the javadoc output, or the \f2included classes\fP.
- .LP
- .TP 3
--included classes
--Classes and interfaces whose details are documented during a run of the Javadoc tool. Same as \f2documented classes\fP.
-+included classes
-+Classes and interfaces whose details are documented during a run of the Javadoc tool. Same as \f2documented classes\fP.
- .LP
- .TP 3
--excluded classes
--Classes and interfaces whose details are \f2not\fP documented during a run of the Javadoc tool.
-+excluded classes
-+Classes and interfaces whose details are \f2not\fP documented during a run of the Javadoc tool.
- .LP
- .TP 3
--referenced classes
--The classes and interfaces that are explicitly referred to in the definition (implementation) or doc comments of the documented classes and interfaces. Examples of references include return type, parameter type, cast type, extended class, implemented interface, imported classes, classes used in method bodies, @see, {@link}, {@linkplain}, and {@inheritDoc} tags. (Notice this definition has changed since
-+referenced classes
-+The classes and interfaces that are explicitly referred to in the definition (implementation) or doc comments of the documented classes and interfaces. Examples of references include return type, parameter type, cast type, extended class, implemented interface, imported classes, classes used in method bodies, @see, {@link}, {@linkplain}, and {@inheritDoc} tags. (Notice this definition has changed since
- .na
- \f21.3\fP @
- .fi
--http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
-+http://docs.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members.
- .LP
- .TP 3
--external referenced classes
--The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited.
-+external referenced classes
-+The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited.
- .RE
- .SH "SOURCE FILES"
- .LP
- The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document.
--.SS
-+.SS
- Class Source Code Files
- .LP
- Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments.
--.SS
-+.SS
- Package Comment Files
- .LP
- Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package.
-@@ -228,10 +228,10 @@
- .RS 3
- .TP 2
- o
--\f2package\-info.java\fP \- Can contain a package declaration, package annotations, package comments and Javadoc tags. This file is generally preferred over package.html.
-+\f2package\-info.java\fP \- Can contain a package declaration, package annotations, package comments and Javadoc tags. This file is generally preferred over package.html.
- .TP 2
- o
--\f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations.
-+\f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations.
- .RE
- .LP
- A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files.
-@@ -244,9 +244,9 @@
- .fl
- /**
- .fl
-- * Provides the classes necessary to create an
-+ * Provides the classes necessary to create an
- .fl
-- * applet and the classes an applet uses
-+ * applet and the classes an applet uses
- .fl
- * to communicate with its applet context.
- .fl
-@@ -260,7 +260,7 @@
- .fl
- * {@link java.awt.Panel} class) with a few extra
- .fl
-- * methods that the applet context can use to
-+ * methods that the applet context can use to
- .fl
- * initialize, start, and stop the applet.
- .fl
-@@ -289,7 +289,7 @@
- .fl
- <BODY>
- .fl
--Provides the classes necessary to create an applet and the
-+Provides the classes necessary to create an applet and the
- .fl
- classes an applet uses to communicate with its applet context.
- .fl
-@@ -303,11 +303,11 @@
- .fl
- few extra methods that the applet context can use to
- .fl
--initialize, start, and stop the applet.
-+initialize, start, and stop the applet.
- .fl
-
- .fl
--@since 1.0
-+@since 1.0
- .fl
- @see java.awt
- .fl
-@@ -318,7 +318,7 @@
- \fP
- .fi
- .LP
--Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the
-+Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the
- .na
- \f2example of \fP\f2package.html\fP @
- .fi
-@@ -328,26 +328,26 @@
- .RS 3
- .TP 2
- o
--Copies the comment for processing. (For \f2package.html\fP, copies all content between \f2<body>\fP and \f2</body>\fP HTML tags. You can include a \f2<head>\fP section to put a \f2<title>\fP, source file copyright statement, or other information, but none of these will appear in the generated documentation.)
-+Copies the comment for processing. (For \f2package.html\fP, copies all content between \f2<body>\fP and \f2</body>\fP HTML tags. You can include a \f2<head>\fP section to put a \f2<title>\fP, source file copyright statement, or other information, but none of these will appear in the generated documentation.)
- .TP 2
- o
--Processes any package tags that are present.
-+Processes any package tags that are present.
- .TP 2
- o
--Inserts the processed text at the bottom of the package summary page it generates, as shown in
-+Inserts the processed text at the bottom of the package summary page it generates, as shown in
- .na
- \f2Package Summary\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html.
-+http://docs.oracle.com/javase/7/docs/api/java/applet/package\-summary.html.
- .TP 2
- o
--Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in
-+Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in
- .na
- \f2Overview Summary\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
-+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions.
- .RE
--.SS
-+.SS
- Overview Comment File
- .LP
- Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages.
-@@ -362,22 +362,22 @@
- .RS 3
- .TP 2
- o
--Copies all content between \f2<body>\fP and \f2</body>\fP tags for processing.
-+Copies all content between \f2<body>\fP and \f2</body>\fP tags for processing.
- .TP 2
- o
--Processes any overview tags that are present.
-+Processes any overview tags that are present.
- .TP 2
- o
--Inserts the processed text at the bottom of the overview page it generates, as shown in
-+Inserts the processed text at the bottom of the overview page it generates, as shown in
- .na
- \f2Overview Summary\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/overview\-summary.html.
-+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html.
- .TP 2
- o
--Copies the first sentence of the overview comment to the top of the overview summary page.
-+Copies the first sentence of the overview comment to the top of the overview summary page.
- .RE
--.SS
-+.SS
- Miscellaneous Unprocessed Files
- .LP
- You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file.
-@@ -390,7 +390,7 @@
- .fl
- /**
- .fl
-- * This button looks like this:
-+ * This button looks like this:
- .fl
- * <img src="doc\-files/Button.gif">
- .fl
-@@ -398,7 +398,7 @@
- .fl
- \fP
- .fi
--.SS
-+.SS
- Test Files and Template Files
- .LP
- Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files.
-@@ -429,60 +429,60 @@
- .RS 3
- .TP 2
- o
--One \f3class or interface page\fP (\f2classname\fP\f2.html\fP) for each class or interface it is documenting.
-+One \f3class or interface page\fP (\f2classname\fP\f2.html\fP) for each class or interface it is documenting.
- .TP 2
- o
--One \f3package page\fP (\f2package\-summary.html\fP) for each package it is documenting. The Javadoc tool will include any HTML text provided in a file named \f2package.html\fP or \f2package\-info.java\fP in the package directory of the source tree.
-+One \f3package page\fP (\f2package\-summary.html\fP) for each package it is documenting. The Javadoc tool will include any HTML text provided in a file named \f2package.html\fP or \f2package\-info.java\fP in the package directory of the source tree.
- .TP 2
- o
--One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
-+One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
- .RE
- .LP
- \f3Cross\-Reference Pages\fP
- .RS 3
- .TP 2
- o
--One \f3class hierarchy page for the entire set of packages\fP (\f2overview\-tree.html\fP). To view this, click on "Overview" in the navigation bar, then click on "Tree".
-+One \f3class hierarchy page for the entire set of packages\fP (\f2overview\-tree.html\fP). To view this, click on "Overview" in the navigation bar, then click on "Tree".
- .TP 2
- o
--One \f3class hierarchy page for each package\fP (\f2package\-tree.html\fP) To view this, go to a particular package, class or interface page; click "Tree" to display the hierarchy for that package.
-+One \f3class hierarchy page for each package\fP (\f2package\-tree.html\fP) To view this, go to a particular package, class or interface page; click "Tree" to display the hierarchy for that package.
- .TP 2
- o
--One \f3"use" page\fP for each package (\f2package\-use.html\fP) and a separate one for each class and interface (\f2class\-use/\fP\f2classname\fP\f2.html\fP). This page describes what packages, classes, methods, constructors and fields use any part of the given class, interface or package. Given a class or interface A, its "use" page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
-+One \f3"use" page\fP for each package (\f2package\-use.html\fP) and a separate one for each class and interface (\f2class\-use/\fP\f2classname\fP\f2.html\fP). This page describes what packages, classes, methods, constructors and fields use any part of the given class, interface or package. Given a class or interface A, its "use" page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
- .TP 2
- o
--A \f3deprecated API page\fP (\f2deprecated\-list.html\fP) listing all deprecated names. (A deprecated name is not recommended for use, generally due to improvements, and a replacement name is usually given. Deprecated APIs may be removed in future implementations.)
-+A \f3deprecated API page\fP (\f2deprecated\-list.html\fP) listing all deprecated names. (A deprecated name is not recommended for use, generally due to improvements, and a replacement name is usually given. Deprecated APIs may be removed in future implementations.)
- .TP 2
- o
--A \f3constant field values page\fP (\f2constant\-values.html\fP) for the values of static fields.
-+A \f3constant field values page\fP (\f2constant\-values.html\fP) for the values of static fields.
- .TP 2
- o
--A \f3serialized form page\fP (\f2serialized\-form.html\fP) for information about serializable and externalizable classes. Each such class has a description of its serialization fields and methods. This information is of interest to re\-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class comment. The standard doclet automatically generates a serialized form page: any class (public or non\-public) that implements Serializable is included, along with \f2readObject\fP and \f2writeObject\fP methods, the fields that are serialized, and the doc comments from the \f2@serial\fP, \f2@serialField\fP, and \f2@serialData\fP tags. Public serializable classes can be excluded by marking them (or their package) with \f2@serial exclude\fP, and package\-private serializable classes can be included by marking them (or their package) with \f2@serial include\fP. As of 1.4, you can generate the complete serialized form for public and private classes by running javadoc \f2without\fP specifying the \f2\-private\fP option.
-+A \f3serialized form page\fP (\f2serialized\-form.html\fP) for information about serializable and externalizable classes. Each such class has a description of its serialization fields and methods. This information is of interest to re\-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class comment. The standard doclet automatically generates a serialized form page: any class (public or non\-public) that implements Serializable is included, along with \f2readObject\fP and \f2writeObject\fP methods, the fields that are serialized, and the doc comments from the \f2@serial\fP, \f2@serialField\fP, and \f2@serialData\fP tags. Public serializable classes can be excluded by marking them (or their package) with \f2@serial exclude\fP, and package\-private serializable classes can be included by marking them (or their package) with \f2@serial include\fP. As of 1.4, you can generate the complete serialized form for public and private classes by running javadoc \f2without\fP specifying the \f2\-private\fP option.
- .TP 2
- o
--An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English).
-+An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English).
- .RE
- .LP
- \f3Support Files\fP
- .RS 3
- .TP 2
- o
--A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
-+A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
- .TP 2
- o
--One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.
-+One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.
- .TP 2
- o
--Several \f3frame files\fP (\f2*\-frame.html\fP) containing lists of packages, classes and interfaces, used when HTML frames are being displayed.
-+Several \f3frame files\fP (\f2*\-frame.html\fP) containing lists of packages, classes and interfaces, used when HTML frames are being displayed.
- .TP 2
- o
--A \f3package list\fP file (\f2package\-list\fP), used by the \f2\-link\fP and \f2\-linkoffline\fP options. This is a text file, not HTML, and is not reachable through any links.
-+A \f3package list\fP file (\f2package\-list\fP), used by the \f2\-link\fP and \f2\-linkoffline\fP options. This is a text file, not HTML, and is not reachable through any links.
- .TP 2
- o
--A \f3style sheet\fP file (\f2stylesheet.css\fP) that controls a limited amount of color, font family, font size, font style and positioning on the generated pages.
-+A \f3style sheet\fP file (\f2stylesheet.css\fP) that controls a limited amount of color, font family, font size, font style and positioning on the generated pages.
- .TP 2
- o
--A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree.
-+A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree.
- .RE
- .LP
- \f3HTML Frames\fP
-@@ -495,10 +495,10 @@
- .RS 3
- .TP 2
- o
--\f2index.html\fP (for frames)
-+\f2index.html\fP (for frames)
- .TP 2
- o
--\f2overview\-summary.html\fP (for no frames)
-+\f2overview\-summary.html\fP (for no frames)
- .RE
- .LP
- \f3Generated File Structure\fP
-@@ -590,7 +590,7 @@
- AudioClip.html Page for AudioClip source code
- .fl
- .fi
--.SS
-+.SS
- Generated API Declarations
- .LP
- The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is:
-@@ -611,7 +611,7 @@
- .SH "DOCUMENTATION COMMENTS"
- .LP
- The original "Documentation Comment Specification" can be found under related documentation.
--.SS
-+.SS
- Commenting the Source Code
- .LP
- You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines.
-@@ -718,13 +718,13 @@
- .nf
- \f3
- .fl
--/**
-+/**
- .fl
- * The horizontal and vertical distances of point (x,y)
- .fl
- */
- .fl
--public int x, y; // Avoid this
-+public int x, y; // Avoid this
- .fl
- \fP
- .fi
-@@ -737,7 +737,7 @@
- .fl
- .fi
- .RS 3
--The horizontal and vertical distances of point (x,y)
-+The horizontal and vertical distances of point (x,y)
- .RE
- .nf
- \f3
-@@ -746,25 +746,25 @@
- .fl
- .fi
- .RS 3
--The horizontal and vertical distances of point (x,y)
-+The horizontal and vertical distances of point (x,y)
- .RE
- .LP
- \f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as <H1> and <H2>, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure.
--.SS
-+.SS
- Automatic Copying of Method Comments
- .LP
- The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments.
- .RS 3
- .TP 2
- o
--\f3Automatically inherit comment to fill in missing text\fP \- When a main description, or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag is missing from a method comment, the Javadoc tool copies the corresponding main description or tag comment from the method it overrides or implements (if any), according to the algorithm below.
-+\f3Automatically inherit comment to fill in missing text\fP \- When a main description, or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag is missing from a method comment, the Javadoc tool copies the corresponding main description or tag comment from the method it overrides or implements (if any), according to the algorithm below.
- .LP
--More specifically, when a \f2@param\fP tag for a particular parameter is missing, then the comment for that parameter is copied from the method further up the inheritance hierarchy. When a \f2@throws\fP tag for a particular exception is missing, the \f2@throws\fP tag is copied \f2only if that exception is declared\fP.
-+More specifically, when a \f2@param\fP tag for a particular parameter is missing, then the comment for that parameter is copied from the method further up the inheritance hierarchy. When a \f2@throws\fP tag for a particular exception is missing, the \f2@throws\fP tag is copied \f2only if that exception is declared\fP.
- .LP
--This behavior contrasts with version 1.3 and earlier, where the presence of any main description or tag would prevent all comments from being inherited.
-+This behavior contrasts with version 1.3 and earlier, where the presence of any main description or tag would prevent all comments from being inherited.
- .TP 2
- o
--\f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot.
-+\f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot.
- .RE
- .LP
- The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class
-@@ -773,13 +773,13 @@
- .RS 3
- .TP 2
- o
--When a method in a class overrides a method in a superclass
-+When a method in a class overrides a method in a superclass
- .TP 2
- o
--When a method in an interface overrides a method in a superinterface
-+When a method in an interface overrides a method in a superinterface
- .TP 2
- o
--When a method in a class implements a method in an interface
-+When a method in a class implements a method in an interface
- .RE
- .LP
- In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited.
-@@ -790,37 +790,37 @@
- .RS 3
- .TP 3
- 1.
--Look in each directly implemented (or extended) interface in the order they appear following the word implements (or extends) in the method declaration. Use the first doc comment found for this method.
-+Look in each directly implemented (or extended) interface in the order they appear following the word implements (or extends) in the method declaration. Use the first doc comment found for this method.
- .TP 3
- 2.
--If step 1 failed to find a doc comment, recursively apply this entire algorithm to each directly implemented (or extended) interface, in the same order they were examined in step 1.
-+If step 1 failed to find a doc comment, recursively apply this entire algorithm to each directly implemented (or extended) interface, in the same order they were examined in step 1.
- .TP 3
- 3.
--If step 2 failed to find a doc comment and this is a class other than Object (not an interface):
-+If step 2 failed to find a doc comment and this is a class other than Object (not an interface):
- .RS 3
- .TP 3
- a.
--If the superclass has a doc comment for this method, use it.
-+If the superclass has a doc comment for this method, use it.
- .TP 3
- b.
--If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass.
-+If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass.
- .RE
- .RE
- .SH "JAVADOC TAGS"
- .LP
--The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together.
-+The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together.
- .LP
- Tags come in two types:
- .RS 3
- .TP 2
- o
--\f3Block tags\fP \- Can be placed only in the tag section that follows the main description. Block tags are of the form: \f2@tag\fP.
-+\f3Block tags\fP \- Can be placed only in the tag section that follows the main description. Block tags are of the form: \f2@tag\fP.
- .TP 2
- o
--\f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP.
-+\f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP.
- .RE
- .LP
--For information about tags we might introduce in future releases, see
-+For information about tags we might introduce in future releases, see
- .na
- \f2Proposed Tags\fP @
- .fi
-@@ -828,6 +828,7 @@
- .LP
- The current tags are:
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -952,83 +953,83 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Tag\fP\h'|\n(41u'\f3Introduced in JDK/SDK\fP
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@author\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@code}\fP\h'|\n(41u'1.5
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@docRoot}\fP\h'|\n(41u'1.3
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@deprecated\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@exception\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@inheritDoc}\fP\h'|\n(41u'1.4
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@link}\fP\h'|\n(41u'1.2
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@linkplain}\fP\h'|\n(41u'1.4
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@literal}\fP\h'|\n(41u'1.5
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@param\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@return\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@see\fP\h'|\n(41u'1.0
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@serial\fP\h'|\n(41u'1.2
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@serialData\fP\h'|\n(41u'1.2
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@serialField\fP\h'|\n(41u'1.2
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@since\fP\h'|\n(41u'1.1
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@throws\fP\h'|\n(41u'1.2
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2{@value}\fP\h'|\n(41u'1.4
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f2@version\fP\h'|\n(41u'1.0
-@@ -1036,16 +1037,17 @@
- .nr T. 1
- .T# 1
- .35
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-42
- .LP
- For custom tags, see the \-tag option.
- .RS 3
- .TP 3
--@author\ name\-text
--Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
-+@author\ name\-text
-+Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
- .RE
- .LP
--For more details, see Where Tags Can Be Used and
-+For more details, see Where Tags Can Be Used and
- .na
- \f2writing @author tags\fP @
- .fi
-@@ -1053,14 +1055,14 @@
- .LP
- .RS 3
- .TP 3
--@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation.
-+@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation.
- .RE
- .LP
- Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field.
- .LP
- The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API:
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @deprecated tags\fP @
- .fi
-@@ -1068,7 +1070,7 @@
- .RS 3
- .TP 2
- o
--For Javadoc 1.2 and later, use a \f2{@link}\fP tag. This creates the link in\-line, where you want it. For example:
-+For Javadoc 1.2 and later, use a \f2{@link}\fP tag. This creates the link in\-line, where you want it. For example:
- .nf
- \f3
- .fl
-@@ -1078,75 +1080,75 @@
- .fl
- */
- .fl
--
-+
- .fl
- \fP
- .fi
- .TP 2
- o
--For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag.
-+For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag.
- .RE
- .LP
--For more about deprecation, see
-+For more about deprecation, see
- .na
- \f2The @deprecated tag\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
- .LP
- .RS 3
- .TP 3
--{@code\ text}
--Equivalent to \f2<code>{@literal}</code>\fP.
-+{@code\ text}
-+Equivalent to \f2<code>{@literal}</code>\fP.
- .LP
--Displays \f2text\fP in \f2code\fP font without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text:
-+Displays \f2text\fP in \f2code\fP font without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text:
- .nf
- \f3
- .fl
- \fP\f4{@code A<B>C}\fP\f3
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--displays in the generated HTML page unchanged, as:
-+displays in the generated HTML page unchanged, as:
- .nf
- \f3
- .fl
- \fP\f4A<B>C\fP\f3
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--The noteworthy point is that the \f2<B>\fP is not interpreted as bold and is in code font.
-+The noteworthy point is that the \f2<B>\fP is not interpreted as bold and is in code font.
- .LP
--If you want the same functionality without the code font, use \f2{@literal}\fP.
-+If you want the same functionality without the code font, use \f2{@literal}\fP.
- .LP
- .TP 3
--{@docRoot}
--Represents the relative path to the generated document's (destination) root directory from any generated page. It is useful when you want to include a file, such as a copyright page or company logo, that you want to reference from all generated pages. Linking to the copyright page from the bottom of each page is common.
-+{@docRoot}
-+Represents the relative path to the generated document's (destination) root directory from any generated page. It is useful when you want to include a file, such as a copyright page or company logo, that you want to reference from all generated pages. Linking to the copyright page from the bottom of each page is common.
- .LP
--This \f2{@docRoot}\fP tag can be used both on the command line and in a doc comment: This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field, including the text portion of any tag (such as @return, @param and @deprecated).
-+This \f2{@docRoot}\fP tag can be used both on the command line and in a doc comment: This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field, including the text portion of any tag (such as @return, @param and @deprecated).
- .RS 3
- .TP 3
- 1.
--On the command line, where the header/footer/bottom are defined:
-+On the command line, where the header/footer/bottom are defined:
- .nf
- \f3
- .fl
- javadoc \-bottom '<a href="{@docRoot}/copyright.html">Copyright</a>'
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--NOTE \- When using \f2{@docRoot}\fP this way in a make file, some makefile programs require special escaping for the brace {} characters. For example, the Inprise MAKE version 5.2 running on Windows requires double braces: \f2{{@docRoot}}\fP. It also requires double (rather than single) quotes to enclose arguments to options such as \f2\-bottom\fP (with the quotes around the \f2href\fP argument omitted).
-+NOTE \- When using \f2{@docRoot}\fP this way in a make file, some makefile programs require special escaping for the brace {} characters. For example, the Inprise MAKE version 5.2 running on Windows requires double braces: \f2{{@docRoot}}\fP. It also requires double (rather than single) quotes to enclose arguments to options such as \f2\-bottom\fP (with the quotes around the \f2href\fP argument omitted).
- .TP 3
- 2.
--In a doc comment:
-+In a doc comment:
- .nf
- \f3
- .fl
-@@ -1156,159 +1158,159 @@
- .fl
- */
- .fl
--
-+
- .fl
- \fP
- .fi
- .RE
- .LP
--The reason this tag is needed is because the generated docs are in hierarchical directories, as deep as the number of subpackages. This expression:
-+The reason this tag is needed is because the generated docs are in hierarchical directories, as deep as the number of subpackages. This expression:
- .nf
- \f3
- .fl
- <a href="{@docRoot}/copyright.html">
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--would resolve to:
-+would resolve to:
- .nf
- \f3
- .fl
- <a href="../../copyright.html"> for java/lang/Object.java
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--and
-+and
- .nf
- \f3
- .fl
- <a href="../../../copyright.html"> for java/lang/ref/Reference.java
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
- .TP 3
--@exception\ class\-name\ description
--The \f2@exception\fP tag is a synonym for \f2@throws\fP.
-+@exception\ class\-name\ description
-+The \f2@exception\fP tag is a synonym for \f2@throws\fP.
- .LP
- .TP 3
--{@inheritDoc}\
--Inherits (copies) documentation from the "nearest" inheritable class or implementable interface into the current doc comment at this tag's location. This allows you to write more general comments higher up the inheritance tree, and to write around the copied text.
-+{@inheritDoc}\
-+Inherits (copies) documentation from the "nearest" inheritable class or implementable interface into the current doc comment at this tag's location. This allows you to write more general comments higher up the inheritance tree, and to write around the copied text.
- .LP
--This tag is valid only in these places in a doc comment:
-+This tag is valid only in these places in a doc comment:
- .RS 3
- .TP 2
- o
--In the main description block of a method. In this case, the main description is copied from a class or interface up the hierarchy.
-+In the main description block of a method. In this case, the main description is copied from a class or interface up the hierarchy.
- .TP 2
- o
--In the text arguments of the @return, @param and @throws tags of a method. In this case, the tag text is copied from the corresponding tag up the hierarchy.
-+In the text arguments of the @return, @param and @throws tags of a method. In this case, the tag text is copied from the corresponding tag up the hierarchy.
- .RE
- .LP
--See Automatic Copying of Method Comments for a more precise description of how comments are found in the inheritance hierarchy. Note that if this tag is missing, the comment is or is not automatically inherited according to rules described in that section.
-+See Automatic Copying of Method Comments for a more precise description of how comments are found in the inheritance hierarchy. Note that if this tag is missing, the comment is or is not automatically inherited according to rules described in that section.
- .LP
- .TP 3
--{@link\ package.class#member\ label}
--Inserts an in\-line link with visible text \f2label\fP that points to the documentation for the specified package, class or member name of a referenced class. This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field, including the text portion of any tag (such as @return, @param and @deprecated).
-+{@link\ package.class#member\ label}
-+Inserts an in\-line link with visible text \f2label\fP that points to the documentation for the specified package, class or member name of a referenced class. This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field, including the text portion of any tag (such as @return, @param and @deprecated).
- .LP
--This tag is very simliar to \f2@see\fP \-\- both require the same references and accept exactly the same syntax for \f2package.class\fP\f2#\fP\f2member\fP and \f2label\fP. The main difference is that \f2{@link}\fP generates an in\-line link rather than placing the link in the "See Also" section. Also, the \f2{@link}\fP tag begins and ends with curly braces to separate it from the rest of the in\-line text. If you need to use "}" inside the label, use the HTML entity notation &#125;
-+This tag is very simliar to \f2@see\fP \-\- both require the same references and accept exactly the same syntax for \f2package.class\fP\f2#\fP\f2member\fP and \f2label\fP. The main difference is that \f2{@link}\fP generates an in\-line link rather than placing the link in the "See Also" section. Also, the \f2{@link}\fP tag begins and ends with curly braces to separate it from the rest of the in\-line text. If you need to use "}" inside the label, use the HTML entity notation &#125;
- .LP
--There is no limit to the number of \f2{@link}\fP tags allowed in a sentence. You can use this tag in the main description part of any documentation comment or in the text portion of any tag (such as @deprecated, @return or @param).
-+There is no limit to the number of \f2{@link}\fP tags allowed in a sentence. You can use this tag in the main description part of any documentation comment or in the text portion of any tag (such as @deprecated, @return or @param).
- .LP
--For example, here is a comment that refers to the \f2getComponentAt(int, int)\fP method:
-+For example, here is a comment that refers to the \f2getComponentAt(int, int)\fP method:
- .nf
- \f3
- .fl
- Use the {@link #getComponentAt(int, int) getComponentAt} method.
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--From this, the standard doclet would generate the following HTML (assuming it refers to another class in the same package):
-+From this, the standard doclet would generate the following HTML (assuming it refers to another class in the same package):
- .nf
- \f3
- .fl
- Use the <a href="Component.html#getComponentAt(int, int)">getComponentAt</a> method.
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--Which appears on the web page as:
-+Which appears on the web page as:
- .nf
- \f3
- .fl
- Use the getComponentAt method.
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--You can extend \f2{@link}\fP to link to classes not being documented by using the \f2\-link\fP option.
-+You can extend \f2{@link}\fP to link to classes not being documented by using the \f2\-link\fP option.
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing {@link} tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}.
- .LP
- .TP 3
--{@linkplain\ package.class#member\ label}
--Identical to \f2{@link}\fP, except the link's label is displayed in plain text than code font. Useful when the label is plain text. Example:
-+{@linkplain\ package.class#member\ label}
-+Identical to \f2{@link}\fP, except the link's label is displayed in plain text than code font. Useful when the label is plain text. Example:
- .nf
- \f3
- .fl
- Refer to {@linkplain add() the overridden method}.
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--This would display as:
-+This would display as:
- .LP
--Refer to the overridden method.
-+Refer to the overridden method.
- .LP
- .TP 3
--{@literal\ text}
--Displays \f2text\fP without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text:
-+{@literal\ text}
-+Displays \f2text\fP without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text:
- .nf
- \f3
- .fl
- \fP\f4{@literal A<B>C}\fP\f3
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--displays unchanged in the generated HTML page in your browser, as:
-+displays unchanged in the generated HTML page in your browser, as:
- .LP
--\f2\ \ \ \ \ \fPA<B>C
-+\f2\ \ \ \ \ \fPA<B>C
- .LP
--The noteworthy point is that the \f2<B>\fP is not interpreted as bold (and it is not in code font).
-+The noteworthy point is that the \f2<B>\fP is not interpreted as bold (and it is not in code font).
- .LP
--If you want the same functionality but with the text in code font, use \f2{@code}\fP.
-+If you want the same functionality but with the text in code font, use \f2{@code}\fP.
- .LP
- .TP 3
--@param\ parameter\-name description
--Adds a parameter with the specified \f2parameter\-name\fP followed by the specified \f2description\fP to the "Parameters" section. When writing the doc comment, you may continue the \f2description\fP onto multiple lines. This tag is valid only in a doc comment for a method, constructor or class.
-+@param\ parameter\-name description
-+Adds a parameter with the specified \f2parameter\-name\fP followed by the specified \f2description\fP to the "Parameters" section. When writing the doc comment, you may continue the \f2description\fP onto multiple lines. This tag is valid only in a doc comment for a method, constructor or class.
- .LP
--The \f2parameter\-name\fP can be the name of a parameter in a method or constructor, or the name of a type parameter of a class, method or constructor. Use angle brackets around this parameter name to specify the use of a type parameter.
-+The \f2parameter\-name\fP can be the name of a parameter in a method or constructor, or the name of a type parameter of a class, method or constructor. Use angle brackets around this parameter name to specify the use of a type parameter.
- .LP
--Example of a type parameter of a class:
-+Example of a type parameter of a class:
- .nf
- \f3
- .fl
-@@ -1322,12 +1324,12 @@
- .fl
- }
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--Example of a type parameter of a method:
-+Example of a type parameter of a method:
- .nf
- \f3
- .fl
-@@ -1347,45 +1349,45 @@
- .fl
- }
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @param tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param.
- .LP
- .TP 3
--@return\ description
--Adds a "Returns" section with the \f2description\fP text. This text should describe the return type and permissible range of values. This tag is valid only in a doc comment for a method.
-+@return\ description
-+Adds a "Returns" section with the \f2description\fP text. This text should describe the return type and permissible range of values. This tag is valid only in a doc comment for a method.
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @return tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return.
- .LP
- .TP 3
--@see\ reference
--Adds a "See Also" heading with a link or text entry that points to \f2reference\fP. A doc comment may contain any number of \f2@see\fP tags, which are all grouped under the same heading. The \f2@see\fP tag has three variations; the third form below is the most common. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. For inserting an in\-line link within a sentence to a package, class or member, see \f2{@link}\fP.
-+@see\ reference
-+Adds a "See Also" heading with a link or text entry that points to \f2reference\fP. A doc comment may contain any number of \f2@see\fP tags, which are all grouped under the same heading. The \f2@see\fP tag has three variations; the third form below is the most common. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. For inserting an in\-line link within a sentence to a package, class or member, see \f2{@link}\fP.
- .RS 3
- .TP 3
--@see "string"
--Adds a text entry for \f2string\fP. No link is generated. The \f2string\fP is a book or other reference to information not available by URL. The Javadoc tool distinguishes this from the previous cases by looking for a double\-quote (\f2"\fP) as the first character. For example:
-+@see "string"
-+Adds a text entry for \f2string\fP. No link is generated. The \f2string\fP is a book or other reference to information not available by URL. The Javadoc tool distinguishes this from the previous cases by looking for a double\-quote (\f2"\fP) as the first character. For example:
- .nf
- \f3
- .fl
- @see "The Java Programming Language"
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--This generates text such as:
-+This generates text such as:
- .RE
- .RE
- .RS 3
-@@ -1393,13 +1395,13 @@
- .RS 3
- .RS 3
- .TP 3
--See Also:
--"The Java Programming Language"
-+See Also:
-+"The Java Programming Language"
- .RE
- .RE
- .TP 3
--@see <a href="URL#value">label</a>
--Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example:
-+@see <a href="URL#value">label</a>
-+Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example:
- .nf
- \f3
- .fl
-@@ -1407,31 +1409,31 @@
- .fl
- \fP
- .fi
--This generates a link such as:
-+This generates a link such as:
- .RS 3
- .TP 3
--See Also:
--Java Spec
-+See Also:
-+Java Spec
- .RE
- .TP 3
--@see\ package.class#member\ label
--Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text.
-+@see\ package.class#member\ label
-+Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text.
- .LP
--Only in version 1.2, just the name but not the label would automatically appear in <code> HTML tags, Starting with 1.2.2, the <code> is always included around the visible text, whether or not a label is used.
-+Only in version 1.2, just the name but not the label would automatically appear in <code> HTML tags, Starting with 1.2.2, the <code> is always included around the visible text, whether or not a label is used.
- .LP
- .RS 3
- .TP 2
- o
--\f4package.class\fP\f4#\fP\f4member\fP is any valid program element name that is referenced \-\- a package, class, interface, constructor, method or field name \-\- except that the character ahead of the member name should be a hash character (\f2#\fP). The \f2class\fP represents any top\-level or nested class or interface. The \f2member\fP represents any constructor, method or field (not a nested class or interface). If this name is in the documented classes, the Javadoc tool will automatically create a link to it. To create links to external referenced classes, use the \f2\-link\fP option. Use either of the other two \f2@see\fP forms for referring to documentation of a name that does not belong to a referenced class. This argument is described at greater length below under Specifying a Name.
-+\f4package.class\fP\f4#\fP\f4member\fP is any valid program element name that is referenced \-\- a package, class, interface, constructor, method or field name \-\- except that the character ahead of the member name should be a hash character (\f2#\fP). The \f2class\fP represents any top\-level or nested class or interface. The \f2member\fP represents any constructor, method or field (not a nested class or interface). If this name is in the documented classes, the Javadoc tool will automatically create a link to it. To create links to external referenced classes, use the \f2\-link\fP option. Use either of the other two \f2@see\fP forms for referring to documentation of a name that does not belong to a referenced class. This argument is described at greater length below under Specifying a Name.
- .TP 2
- o
--\f4label\fP is optional text that is visible as the link's label. The \f2label\fP can contain whitespace. If \f2label\fP is omitted, then \f2package.class.member\fP will appear, suitably shortened relative to the current class and package \-\- see How a name is displayed.
-+\f4label\fP is optional text that is visible as the link's label. The \f2label\fP can contain whitespace. If \f2label\fP is omitted, then \f2package.class.member\fP will appear, suitably shortened relative to the current class and package \-\- see How a name is displayed.
- .TP 2
- o
--A space is the delimiter between \f2package.class\fP\f2#\fP\f2member\fP and \f2label\fP. A space inside parentheses does not indicate the start of a label, so spaces may be used between parameters in a method.
-+A space is the delimiter between \f2package.class\fP\f2#\fP\f2member\fP and \f2label\fP. A space inside parentheses does not indicate the start of a label, so spaces may be used between parameters in a method.
- .RE
- .LP
--\f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP".
-+\f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP".
- .nf
- \f3
- .fl
-@@ -1443,7 +1445,7 @@
- .fl
- \fP
- .fi
--The standard doclet produces HTML something like this:
-+The standard doclet produces HTML something like this:
- .nf
- \f3
- .fl
-@@ -1457,18 +1459,19 @@
- .fl
- \fP
- .fi
--Which looks something like this in a browser, where the label is the visible link text:
-+Which looks something like this in a browser, where the label is the visible link text:
- .RS 3
- .TP 3
--See Also:
--equals
-+See Also:
-+equals
- .RE
- .LP
--\f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments.
-+\f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments.
- .LP
--Of course the advantage of providing shorter, "partially\-qualified" names is that they are shorter to type and there is less clutter in the source code. The following table shows the different forms of the name, where \f2Class\fP can be a class or interface, \f2Type\fP can be a class, interface, array, or primitive, and \f2method\fP can be a method or constructor.
-+Of course the advantage of providing shorter, "partially\-qualified" names is that they are shorter to type and there is less clutter in the source code. The following table shows the different forms of the name, where \f2Class\fP can be a class or interface, \f2Type\fP can be a class, interface, array, or primitive, and \f2method\fP can be a method or constructor.
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -1629,7 +1632,7 @@
- .ec
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u
-+.ta \n(80u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'
-@@ -1645,7 +1648,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u
-+.ta \n(80u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'
-@@ -1661,7 +1664,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u
-+.ta \n(80u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'
-@@ -1677,7 +1680,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u
-+.ta \n(80u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'
-@@ -1699,54 +1702,56 @@
- .rm b+
- .rm c+
- .rm d+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-58
- .LP
--The following notes apply to the above table:
-+The following notes apply to the above table:
- .RS 3
- .TP 2
- o
--The first set of forms (with no class or package) will cause the Javadoc tool to search only through the current class's hierarchy. It will find a member of the current class or interface, one of its superclasses or superinterfaces, or one of its enclosing classes or interfaces (search steps 1\-3). It will not search the rest of the current package or other packages (search steps 4\-5).
-+The first set of forms (with no class or package) will cause the Javadoc tool to search only through the current class's hierarchy. It will find a member of the current class or interface, one of its superclasses or superinterfaces, or one of its enclosing classes or interfaces (search steps 1\-3). It will not search the rest of the current package or other packages (search steps 4\-5).
- .TP 2
- o
--If any method or constructor is entered as a name with no parentheses, such as \f2getValue\fP, and if there is no field with the same name, the Javadoc tool will correctly create a link to it, but will print a warning message reminding you to add the parentheses and arguments. If this method is overloaded, the Javadoc tool will link to the first method its search encounters, which is unspecified.
-+If any method or constructor is entered as a name with no parentheses, such as \f2getValue\fP, and if there is no field with the same name, the Javadoc tool will correctly create a link to it, but will print a warning message reminding you to add the parentheses and arguments. If this method is overloaded, the Javadoc tool will link to the first method its search encounters, which is unspecified.
- .TP 2
- o
--Nested classes must be specified as \f2outer\fP\f2.\fP\f2inner\fP, not simply \f2inner\fP, for all forms.
-+Nested classes must be specified as \f2outer\fP\f2.\fP\f2inner\fP, not simply \f2inner\fP, for all forms.
- .TP 2
- o
--As stated, the hash character (\f2#\fP), rather than a dot (\f2.\fP) separates a member from its class. This enables the Javadoc tool to resolve ambiguities, since the dot also separates classes, nested classes, packages, and subpackages. However, the Javadoc tool is generally lenient and will properly parse a dot if you know there is no ambiguity, though it will print a warning.
-+As stated, the hash character (\f2#\fP), rather than a dot (\f2.\fP) separates a member from its class. This enables the Javadoc tool to resolve ambiguities, since the dot also separates classes, nested classes, packages, and subpackages. However, the Javadoc tool is generally lenient and will properly parse a dot if you know there is no ambiguity, though it will print a warning.
- .RE
- .LP
--\f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified.
-+\f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified.
- .LP
--When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
-+When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order:
- .RS 3
- .TP 3
- 1.
--the current class or interface
-+the current class or interface
- .TP 3
- 2.
--any enclosing classes and interfaces, searching closest first
-+any enclosing classes and interfaces, searching closest first
- .TP 3
- 3.
--any superclasses and superinterfaces, searching closest first
-+any superclasses and superinterfaces, searching closest first
- .TP 3
- 4.
--the current package
-+the current package
- .TP 3
- 5.
--any imported packages, classes and interfaces, searching in the order of the import statement
-+any imported packages, classes and interfaces, searching in the order of the import statement
- .RE
- .LP
--The Javadoc tool continues to search recursively through steps 1\-3 for each class it encounters until it finds a match. That is, after it searches through the current class and its enclosing class E, it will search through E's superclasses before E's enclosing classes. In steps 4 and 5, the Javadoc tool does not search classes or interfaces within a package in any specified order (that order depends on the particular compiler). In step 5, the Javadoc tool looks in java.lang, since that is automatically imported by all programs.
-+The Javadoc tool continues to search recursively through steps 1\-3 for each class it encounters until it finds a match. That is, after it searches through the current class and its enclosing class E, it will search through E's superclasses before E's enclosing classes. In steps 4 and 5, the Javadoc tool does not search classes or interfaces within a package in any specified order (that order depends on the particular compiler). In step 5, the Javadoc tool looks in java.lang, since that is automatically imported by all programs.
- .LP
--The Javadoc tool does not necessarily look in subclasses, nor will it look in other packages even if their documentation is being generated in the same run. For example, if the \f2@see\fP tag is in the \f2java.awt.event.KeyEvent\fP class and refers to a name in the \f2java.awt\fP package, javadoc does not look in that package unless that class imports it.
-+The Javadoc tool does not necessarily look in subclasses, nor will it look in other packages even if their documentation is being generated in the same run. For example, if the \f2@see\fP tag is in the \f2java.awt.event.KeyEvent\fP class and refers to a name in the \f2java.awt\fP package, javadoc does not look in that package unless that class imports it.
- .LP
--\f3How a name is displayed\fP \- If \f2label\fP is omitted, then \f2package.class.member\fP appears. In general, it is suitably shortened relative to the current class and package. By "shortened", we mean the Javadoc tool displays only the minimum name necessary. For example, if the \f2String.toUpperCase()\fP method contains references to a member of the same class and to a member of a different class, the class name is displayed only in the latter case, as shown in the following table.
-+\f3How a name is displayed\fP \- If \f2label\fP is omitted, then \f2package.class.member\fP appears. In general, it is suitably shortened relative to the current class and package. By "shortened", we mean the Javadoc tool displays only the minimum name necessary. For example, if the \f2String.toUpperCase()\fP method contains references to a member of the same class and to a member of a different class, the class name is displayed only in the latter case, as shown in the following table.
- .LP
- Use \-noqualifier to globally remove the package names.
- .br
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -1973,7 +1978,7 @@
- .ec
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u
-+.ta \n(80u \n(81u \n(82u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Type of Reference\fP\h'|\n(41u'\h'|\n(42u'\f3Displays As\fP
-@@ -1991,7 +1996,7 @@
- .ne \n(c|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u
-+.ta \n(80u \n(81u \n(82u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'\f2@see String#toLowerCase()\fP\h'|\n(42u'
-@@ -2018,7 +2023,7 @@
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u
-+.ta \n(80u \n(81u \n(82u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
-@@ -2052,7 +2057,7 @@
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u
-+.ta \n(80u \n(81u \n(82u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
-@@ -2093,125 +2098,126 @@
- .rm g+
- .rm h+
- .rm i+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-28
- .LP
- \f3Examples of @see\fP
- .br
--The comment to the right shows how the name would be displayed if the \f2@see\fP tag is in a class in another package, such as \f2java.applet.Applet\fP.
-+The comment to the right shows how the name would be displayed if the \f2@see\fP tag is in a class in another package, such as \f2java.applet.Applet\fP.
- .nf
- \f3
- .fl
-- See also:
-+ See also:
- .fl
--@see java.lang.String // String \fP\f3
-+@see java.lang.String // String \fP\f3
- .fl
--@see java.lang.String The String class // The String class \fP\f3
-+@see java.lang.String The String class // The String class \fP\f3
- .fl
--@see String // String \fP\f3
-+@see String // String \fP\f3
- .fl
--@see String#equals(Object) // String.equals(Object) \fP\f3
-+@see String#equals(Object) // String.equals(Object) \fP\f3
- .fl
--@see String#equals // String.equals(java.lang.Object) \fP\f3
-+@see String#equals // String.equals(java.lang.Object) \fP\f3
- .fl
--@see java.lang.Object#wait(long) // java.lang.Object.wait(long) \fP\f3
-+@see java.lang.Object#wait(long) // java.lang.Object.wait(long) \fP\f3
- .fl
--@see Character#MAX_RADIX // Character.MAX_RADIX \fP\f3
-+@see Character#MAX_RADIX // Character.MAX_RADIX \fP\f3
- .fl
--@see <a href="spec.html">Java Spec</a> // Java Spec \fP\f3
-+@see <a href="spec.html">Java Spec</a> // Java Spec \fP\f3
- .fl
--@see "The Java Programming Language" // "The Java Programming Language" \fP\f3
-+@see "The Java Programming Language" // "The Java Programming Language" \fP\f3
- .fl
- \fP
- .fi
--You can extend \f2@see\fP to link to classes not being documented by using the \f2\-link\fP option.
-+You can extend \f2@see\fP to link to classes not being documented by using the \f2\-link\fP option.
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @see tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see.
- .RE
- .RE
- .LP
- .RS 3
- .TP 3
--@serial\ field\-description | include | exclude
--Used in the doc comment for a default serializable field.
-+@serial\ field\-description | include | exclude
-+Used in the doc comment for a default serializable field.
- .LP
--An optional \f2field\-description\fP should explain the meaning of the field and list the acceptable values. If needed, the description can span multiple lines. The standard doclet adds this information to the serialized form page.
-+An optional \f2field\-description\fP should explain the meaning of the field and list the acceptable values. If needed, the description can span multiple lines. The standard doclet adds this information to the serialized form page.
- .LP
--If a serializable field was added to a class some time after the class was made serializable, a statement should be added to its main description to identify at which version it was added.
-+If a serializable field was added to a class some time after the class was made serializable, a statement should be added to its main description to identify at which version it was added.
- .LP
--The \f2include\fP and \f2exclude\fP arguments identify whether a class or package should be included or excluded from the serialized form page. They work as follows:
-+The \f2include\fP and \f2exclude\fP arguments identify whether a class or package should be included or excluded from the serialized form page. They work as follows:
- .RS 3
- .TP 2
- o
--A public or protected class that implements \f2Serializable\fP is \f2included\fP unless that class (or its package) is marked \f2@serial exclude\fP.
-+A public or protected class that implements \f2Serializable\fP is \f2included\fP unless that class (or its package) is marked \f2@serial exclude\fP.
- .TP 2
- o
--A private or package\-private class that implements \f2Serializable\fP is \f2excluded\fP unless that class (or its package) is marked \f2@serial include\fP.
-+A private or package\-private class that implements \f2Serializable\fP is \f2excluded\fP unless that class (or its package) is marked \f2@serial include\fP.
- .RE
- .LP
--Examples: The \f2javax.swing\fP package is marked \f2@serial exclude\fP (in \f2package.html\fP or \f2package\-info.java\fP). The public class \f2java.security.BasicPermission\fP is marked \f2@serial exclude\fP. The package\-private class \f2java.util.PropertyPermissionCollection\fP is marked \f2@serial include\fP.
-+Examples: The \f2javax.swing\fP package is marked \f2@serial exclude\fP (in \f2package.html\fP or \f2package\-info.java\fP). The public class \f2java.security.BasicPermission\fP is marked \f2@serial exclude\fP. The package\-private class \f2java.util.PropertyPermissionCollection\fP is marked \f2@serial include\fP.
- .LP
--The tag @serial at a class level overrides @serial at a package level.
-+The tag @serial at a class level overrides @serial at a package level.
- .LP
- For more information about how to use these tags, along with an example, see "
- .na
- \f2Documenting Serializable Fields and Data for a Class\fP @
- .fi
--http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
-+http://docs.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the
- .na
- \f2Serialization FAQ\fP @
- .fi
--http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
-+http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see
- .na
- \f2Sun's criteria\fP @
- .fi
--http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.html for including classes in the serialized form specification.
-+http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.html for including classes in the serialized form specification.
- .LP
- .TP 3
--@serialField\ field\-name\ field\-type\ field\-description
--Documents an \f2ObjectStreamField\fP component of a \f2Serializable\fP class's \f2serialPersistentFields\fP member. One \f2@serialField\fP tag should be used for each \f2ObjectStreamField\fP component.
-+@serialField\ field\-name\ field\-type\ field\-description
-+Documents an \f2ObjectStreamField\fP component of a \f2Serializable\fP class's \f2serialPersistentFields\fP member. One \f2@serialField\fP tag should be used for each \f2ObjectStreamField\fP component.
- .LP
- .TP 3
--@serialData\ data\-description
--The \f2data\-description\fP documents the types and order of data in the serialized form. Specifically, this data includes the optional data written by the \f2writeObject\fP method and all data (including base classes) written by the \f2Externalizable.writeExternal\fP method.
-+@serialData\ data\-description
-+The \f2data\-description\fP documents the types and order of data in the serialized form. Specifically, this data includes the optional data written by the \f2writeObject\fP method and all data (including base classes) written by the \f2Externalizable.writeExternal\fP method.
- .LP
--The \f2@serialData\fP tag can be used in the doc comment for the \f2writeObject\fP, \f2readObject\fP, \f2writeExternal\fP, \f2readExternal\fP, \f2writeReplace\fP, and \f2readResolve\fP methods.
-+The \f2@serialData\fP tag can be used in the doc comment for the \f2writeObject\fP, \f2readObject\fP, \f2writeExternal\fP, \f2readExternal\fP, \f2writeReplace\fP, and \f2readResolve\fP methods.
- .LP
- .TP 3
--@since\ since\-text
--Adds a "Since" heading with the specified \f2since\-text\fP to the generated documentation. The text has no special internal structure. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. This tag means that this change or feature has existed since the software release specified by the \f2since\-text\fP. For example:
-+@since\ since\-text
-+Adds a "Since" heading with the specified \f2since\-text\fP to the generated documentation. The text has no special internal structure. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. This tag means that this change or feature has existed since the software release specified by the \f2since\-text\fP. For example:
- .nf
- \f3
- .fl
- @since 1.5
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--For source code in the Java platform, this tag indicates the version of the Java platform API specification (not necessarily when it was added to the reference implementation). Multiple @since tags are allowed and are treated like multiple @author tags. You could use multiple tags if the prgram element is used by more than one API.
-+For source code in the Java platform, this tag indicates the version of the Java platform API specification (not necessarily when it was added to the reference implementation). Multiple @since tags are allowed and are treated like multiple @author tags. You could use multiple tags if the prgram element is used by more than one API.
- .LP
- .TP 3
--@throws\ class\-name\ description
--The \f2@throws\fP and \f2@exception\fP tags are synonyms. Adds a "Throws" subheading to the generated documentation, with the \f2class\-name\fP and \f2description\fP text. The \f2class\-name\fP is the name of the exception that may be thrown by the method. This tag is valid only in the doc comment for a method or constructor. If this class is not fully\-specified, the Javadoc tool uses the search order to look up this class. Multiple \f2@throws\fP tags can be used in a given doc comment for the same or different exceptions.
-+@throws\ class\-name\ description
-+The \f2@throws\fP and \f2@exception\fP tags are synonyms. Adds a "Throws" subheading to the generated documentation, with the \f2class\-name\fP and \f2description\fP text. The \f2class\-name\fP is the name of the exception that may be thrown by the method. This tag is valid only in the doc comment for a method or constructor. If this class is not fully\-specified, the Javadoc tool uses the search order to look up this class. Multiple \f2@throws\fP tags can be used in a given doc comment for the same or different exceptions.
- .LP
--To ensure that all checked exceptions are documented, if a \f2@throws\fP tag does not exist for an exception in the throws clause, the Javadoc tool automatically adds that exception to the HTML output (with no description) as if it were documented with @throws tag.
-+To ensure that all checked exceptions are documented, if a \f2@throws\fP tag does not exist for an exception in the throws clause, the Javadoc tool automatically adds that exception to the HTML output (with no description) as if it were documented with @throws tag.
- .LP
--The \f2@throws\fP documentation is copied from an overridden method to a subclass only when the exception is explicitly declared in the overridden method. The same is true for copying from an interface method to an implementing method. You can use {@inheritDoc} to force @throws to inherit documentation.
-+The \f2@throws\fP documentation is copied from an overridden method to a subclass only when the exception is explicitly declared in the overridden method. The same is true for copying from an interface method to an implementing method. You can use {@inheritDoc} to force @throws to inherit documentation.
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @throws tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception.
- .LP
- .TP 3
--{@value\ package.class#field}
--When \f2{@value}\fP is used (without any argument) in the doc comment of a static field, it displays the value of that constant:
-+{@value\ package.class#field}
-+When \f2{@value}\fP is used (without any argument) in the doc comment of a static field, it displays the value of that constant:
- .nf
- \f3
- .fl
-@@ -2223,12 +2229,12 @@
- .fl
- public static final String SCRIPT_START = "<script>"
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--When used with argument \f2package.class#field\fP in any doc comment, it displays the value of the specified constant:
-+When used with argument \f2package.class#field\fP in any doc comment, it displays the value of the specified constant:
- .nf
- \f3
- .fl
-@@ -2242,36 +2248,36 @@
- .fl
- }
- .fl
--
-+
- .fl
- \fP
- .fi
- .LP
--The argument \f2package.class#field\fP takes a form identical to that of the @see argument, except that the member must be a static field.
-+The argument \f2package.class#field\fP takes a form identical to that of the @see argument, except that the member must be a static field.
- .LP
--These values of these constants are also displayed on the
-+These values of these constants are also displayed on the
- .na
- \f2Constant Field Values\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/constant\-values.html page.
-+http://docs.oracle.com/javase/7/docs/api/constant\-values.html page.
- .LP
- .TP 3
--@version\ version\-text
--Adds a "Version" subheading with the specified \f2version\-text\fP to the generated docs when the \-version option is used. This tag is intended to hold the current version number of the software that this code is part of (as opposed to @since, which holds the version number where this code was introduced). The \f2version\-text\fP has no special internal structure. To see where the version tag can be used, see Where Tags Can Be Used.
-+@version\ version\-text
-+Adds a "Version" subheading with the specified \f2version\-text\fP to the generated docs when the \-version option is used. This tag is intended to hold the current version number of the software that this code is part of (as opposed to @since, which holds the version number where this code was introduced). The \f2version\-text\fP has no special internal structure. To see where the version tag can be used, see Where Tags Can Be Used.
- .LP
--A doc comment may contain multiple \f2@version\fP tags. If it makes sense, you can specify one version number per \f2@version\fP tag or multiple version numbers per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
-+A doc comment may contain multiple \f2@version\fP tags. If it makes sense, you can specify one version number per \f2@version\fP tag or multiple version numbers per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma.
- .LP
--For more details, see
-+For more details, see
- .na
- \f2writing @version tags\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version.
- .RE
--.SS
-+.SS
- Where Tags Can Be Used
- .LP
- The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP.
--.SS
-+.SS
- Overview Documentation Tags
- .LP
- Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description.
-@@ -2282,27 +2288,27 @@
- .RS 3
- .TP 2
- o
--\f2@see\fP
-+\f2@see\fP
- .TP 2
- o
--\f2@since\fP
-+\f2@since\fP
- .TP 2
- o
--\f2@author\fP
-+\f2@author\fP
- .TP 2
- o
--\f2@version\fP
-+\f2@version\fP
- .TP 2
- o
--\f2{@link}\fP
-+\f2{@link}\fP
- .TP 2
- o
--\f2{@linkplain}\fP
-+\f2{@linkplain}\fP
- .TP 2
- o
--\f2{@docRoot}\fP
-+\f2{@docRoot}\fP
- .RE
--.SS
-+.SS
- Package Documentation Tags
- .LP
- Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
-@@ -2311,30 +2317,30 @@
- .RS 3
- .TP 2
- o
--\f2@see\fP
-+\f2@see\fP
- .TP 2
- o
--\f2@since\fP
-+\f2@since\fP
- .TP 2
- o
--\f2@serial\fP
-+\f2@serial\fP
- .TP 2
- o
--\f2@author\fP
-+\f2@author\fP
- .TP 2
- o
--\f2@version\fP
-+\f2@version\fP
- .TP 2
- o
--\f2{@link}\fP
-+\f2{@link}\fP
- .TP 2
- o
--\f2{@linkplain}\fP
-+\f2{@linkplain}\fP
- .TP 2
- o
--\f2{@docRoot}\fP
-+\f2{@docRoot}\fP
- .RE
--.SS
-+.SS
- Class and Interface Documentation Tags
- .LP
- The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument.
-@@ -2343,31 +2349,31 @@
- .RS 3
- .TP 2
- o
--\f2@see\fP
-+\f2@see\fP
- .TP 2
- o
--\f2@since\fP
-+\f2@since\fP
- .TP 2
- o
--\f2@deprecated\fP
-+\f2@deprecated\fP
- .TP 2
- o
--\f2@serial\fP
-+\f2@serial\fP
- .TP 2
- o
--\f2@author\fP
-+\f2@author\fP
- .TP 2
- o
--\f2@version\fP
-+\f2@version\fP
- .TP 2
- o
--\f2{@link}\fP
-+\f2{@link}\fP
- .TP 2
- o
--\f2{@linkplain}\fP
-+\f2{@linkplain}\fP
- .TP 2
- o
--\f2{@docRoot}\fP
-+\f2{@docRoot}\fP
- .RE
- \f3An example of a class comment:\fP
- .nf
-@@ -2407,7 +2413,7 @@
- .fl
- \fP
- .fi
--.SS
-+.SS
- Field Documentation Tags
- .LP
- The following are the tags that can appear in
-@@ -2416,31 +2422,31 @@
- .RS 3
- .TP 2
- o
--\f2@see\fP
-+\f2@see\fP
- .TP 2
- o
--\f2@since\fP
-+\f2@since\fP
- .TP 2
- o
--\f2@deprecated\fP
-+\f2@deprecated\fP
- .TP 2
- o
--\f2@serial\fP
-+\f2@serial\fP
- .TP 2
- o
--\f2@serialField\fP
-+\f2@serialField\fP
- .TP 2
- o
--\f2{@link}\fP
-+\f2{@link}\fP
- .TP 2
- o
--\f2{@linkplain}\fP
-+\f2{@linkplain}\fP
- .TP 2
- o
--\f2{@docRoot}\fP
-+\f2{@docRoot}\fP
- .TP 2
- o
--\f2{@value}\fP
-+\f2{@value}\fP
- .RE
- \f3An example of a field comment:\fP
- .nf
-@@ -2460,7 +2466,7 @@
- .fl
- \fP
- .fi
--.SS
-+.SS
- Constructor and Method Documentation Tags
- .LP
- The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods.
-@@ -2469,37 +2475,37 @@
- .RS 3
- .TP 2
- o
--\f2@see\fP
-+\f2@see\fP
- .TP 2
- o
--\f2@since\fP
-+\f2@since\fP
- .TP 2
- o
--\f2@deprecated\fP
-+\f2@deprecated\fP
- .TP 2
- o
--\f2@param\fP
-+\f2@param\fP
- .TP 2
- o
--\f2@return\fP
-+\f2@return\fP
- .TP 2
- o
--\f2@throws\fP and \f2@exception\fP
-+\f2@throws\fP and \f2@exception\fP
- .TP 2
- o
--\f2@serialData\fP
-+\f2@serialData\fP
- .TP 2
- o
--\f2{@link}\fP
-+\f2{@link}\fP
- .TP 2
- o
--\f2{@linkplain}\fP
-+\f2{@linkplain}\fP
- .TP 2
- o
--\f2{@inheritDoc}\fP
-+\f2{@inheritDoc}\fP
- .TP 2
- o
--\f2{@docRoot}\fP
-+\f2{@docRoot}\fP
- .RE
- \f3An example of a method doc comment:\fP
- .nf
-@@ -2507,7 +2513,7 @@
- .fl
- /**
- .fl
-- * Returns the character at the specified index. An index
-+ * Returns the character at the specified index. An index
- .fl
- * ranges from <code>0</code> to <code>length() \- 1</code>.
- .fl
-@@ -2517,9 +2523,9 @@
- .fl
- * @return the desired character.
- .fl
-- * @exception StringIndexOutOfRangeException
-+ * @exception StringIndexOutOfRangeException
- .fl
-- * if the index is not in the range <code>0</code>
-+ * if the index is not in the range <code>0</code>
- .fl
- * to <code>length()\-1</code>.
- .fl
-@@ -2541,6 +2547,7 @@
- .LP
- The options are:
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -2774,7 +2781,7 @@
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u
-+.ta \n(80u \n(81u \n(82u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
-@@ -2809,14 +2816,15 @@
- .rm a+
- .rm b+
- .rm c+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-127
- .LP
- Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options.
--.SS
-+.SS
- Javadoc Options
- .RS 3
- .TP 3
--\-overview \ path/filename
-+\-overview \ path/filename
- Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory.
- .br
- .br
-@@ -2829,28 +2837,28 @@
- Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.)
- .br
- .br
--The title on the overview page is set by \f2\-doctitle\fP.
-+The title on the overview page is set by \f2\-doctitle\fP.
- .TP 3
--\-public
--Shows only public classes and members.
-+\-public
-+Shows only public classes and members.
- .TP 3
--\-protected
--Shows only protected and public classes and members. This is the default.
-+\-protected
-+Shows only protected and public classes and members. This is the default.
- .TP 3
--\-package
--Shows only package, protected, and public classes and members.
-+\-package
-+Shows only package, protected, and public classes and members.
- .TP 3
--\-private
--Shows all classes and members.
-+\-private
-+Shows all classes and members.
- .TP 3
--\-help
--Displays the online help, which lists these javadoc and doclet command line options.
-+\-help
-+Displays the online help, which lists these javadoc and doclet command line options.
- .TP 3
--\-doclet\ class
-+\-doclet\ class
- Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
- .br
- .br
--For example, to call the MIF doclet, use:
-+For example, to call the MIF doclet, use:
- .nf
- \f3
- .fl
-@@ -2858,17 +2866,17 @@
- .fl
- \fP
- .fi
--For full, working examples of running a particular doclet, see the
-+For full, working examples of running a particular doclet, see the
- .na
- \f2MIF Doclet documentation\fP @
- .fi
--http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
- .TP 3
--\-docletpath\ classpathlist
-+\-docletpath\ classpathlist
- Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path.
- .br
- .br
--Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included.
-+Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included.
- .nf
- \f3
- .fl
-@@ -2876,7 +2884,7 @@
- .fl
- \fP
- .fi
--Example of path to starting doclet class file. Notice the class filename is omitted.
-+Example of path to starting doclet class file. Notice the class filename is omitted.
- .nf
- \f3
- .fl
-@@ -2884,38 +2892,38 @@
- .fl
- \fP
- .fi
--For full, working examples of running a particular doclet, see the
-+For full, working examples of running a particular doclet, see the
- .na
- \f2MIF Doclet documentation\fP @
- .fi
--http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
-+http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html.
- .TP 3
--\-1.1
--\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
-+\-1.1
-+\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP
- .TP 3
--\-source release
--Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
-+\-source release
-+Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
- .RS 3
- .TP 2
- o
--\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
-+\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used.
- .TP 2
- o
--\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4.
-+\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4.
- .TP 2
- o
--\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
-+\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
- .RE
--Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
-+Use the value of \f2release\fP corresponding to that used when compiling the code with javac.
- .TP 3
--\-sourcepath\ sourcepathlist
-+\-sourcepath\ sourcepathlist
- Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented.
- .br
- .br
- Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files.
- .br
- .br
--Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at:
-+Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at:
- .nf
- \f3
- .fl
-@@ -2923,7 +2931,7 @@
- .fl
- \fP
- .fi
--In this case you would specify the \f2sourcepath\fP to \f2/home/user/src\fP, the directory that contains \f2com/mypackage\fP, and then supply the package name \f2com.mypackage\fP:
-+In this case you would specify the \f2sourcepath\fP to \f2/home/user/src\fP, the directory that contains \f2com/mypackage\fP, and then supply the package name \f2com.mypackage\fP:
- .nf
- \f3
- .fl
-@@ -2933,7 +2941,7 @@
- This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP.
- .br
- .br
--To point to two source paths:
-+To point to two source paths:
- .nf
- \f3
- .fl
-@@ -2941,18 +2949,18 @@
- .fl
- .fi
- .TP 3
--\-classpath\ classpathlist
--Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in
-+\-classpath\ classpathlist
-+Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in
- .na
- \f2class path\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
- .br
- .br
- If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
- .br
- .br
--For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify:
-+For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify:
- .nf
- \f3
- .fl
-@@ -2962,23 +2970,23 @@
- As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory.
- .br
- .br
--For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see
-+For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see
- .na
- \f2How Classes Are Found\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.
-+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.
- .br
- .br
- As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations).
- .br
- .br
--For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
- .TP 3
--\-subpackages\ \ package1:package2:...
-+\-subpackages\ \ package1:package2:...
- Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files.
- .br
- .br
--For example:
-+For example:
- .nf
- \f3
- .fl
-@@ -2988,77 +2996,77 @@
- This command generates documentation for packages named "java" and "javax.swing" and all their subpackages.
- .br
- .br
--You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
-+You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages.
- .TP 3
--\-exclude\ \ packagename1:packagename2:...
--Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example:
-+\-exclude\ \ packagename1:packagename2:...
-+Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example:
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP
- .fl
- .fi
--would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
-+would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
- .TP 3
--\-bootclasspath\ classpathlist
--Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See
-+\-bootclasspath\ classpathlist
-+Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See
- .na
- \f2How Classes Are Found\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
-+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
- .TP 3
--\-extdirs\ dirlist
--Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
-+\-extdirs\ dirlist
-+Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
- .TP 3
--\-verbose
--Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
-+\-verbose
-+Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
- .TP 3
--\-quiet
--Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
-+\-quiet
-+Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
- .TP 3
--\-breakiterator\
--Uses the internationalized sentence boundary of
-+\-breakiterator\
-+Uses the internationalized sentence boundary of
- .na
- \f2java.text.BreakIterator\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
-+http://docs.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
- .br
- .br
--From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm:
-+From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm:
- .RS 3
- .TP 2
- o
--English default sentence\-break algorithm \- Stops at a period followed by a space or a HTML block tag, such as \f2<P>\fP.
-+English default sentence\-break algorithm \- Stops at a period followed by a space or a HTML block tag, such as \f2<P>\fP.
- .TP 2
- o
--Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag.
-+Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag.
- .RE
--NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
-+NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused.
- .TP 3
--\-locale\ language_country_variant
-+\-locale\ language_country_variant
- \f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent.
- .br
- .br
- Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant).
- .br
- .br
--Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
-+Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes.
- .TP 3
--\-encoding\ name
-+\-encoding\ name
- Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used.
- .br
- .br
--Also see \-docencoding and \-charset.
-+Also see \-docencoding and \-charset.
- .TP 3
--\-Jflag
--Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required):
-+\-Jflag
-+Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required):
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-J\-Xmx32m \-J\-Xms32m\fP \f3com.mypackage\fP
- .fl
- .fi
--To tell what version of javadoc you are using, call the "\f2\-version\fP" option of java:
-+To tell what version of javadoc you are using, call the "\f2\-version\fP" option of java:
- .nf
- \f3
- .fl
-@@ -3069,17 +3077,17 @@
- Classic VM (build JDK\-1.2\-V, green threads, sunwjit)
- .fl
- .fi
--(The version number of the standard doclet appears in its output stream.)
-+(The version number of the standard doclet appears in its output stream.)
- .RE
--.SS
-+.SS
- Options Provided by the Standard Doclet
- .RS 3
- .TP 3
--\-d\ directory
-+\-d\ directory
- Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run.
- .br
- .br
--For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory:
-+For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory:
- .nf
- \f3
- .fl
-@@ -3087,7 +3095,7 @@
- .fl
- .fi
- .TP 3
--\-use
-+\-use
- Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C.
- .br
- .br
-@@ -3097,19 +3105,19 @@
- Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP.
- .br
- .br
--You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
-+You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
- .TP 3
--\-version
--Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
-+\-version
-+Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
- .TP 3
--\-author
--Includes the @author text in the generated docs.
-+\-author
-+Includes the @author text in the generated docs.
- .TP 3
--\-splitindex
--Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
-+\-splitindex
-+Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
- .TP 3
--\-windowtitle\ title
--Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option.
-+\-windowtitle\ title
-+Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option.
- .nf
- \f3
- .fl
-@@ -3117,8 +3125,8 @@
- .fl
- .fi
- .TP 3
--\-doctitle\ title
--Specifies the title to be placed near the top of the overview summary file. The title will be placed as a centered, level\-one heading directly beneath the upper navigation bar. The \f2title\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2title\fP may have to be escaped.
-+\-doctitle\ title
-+Specifies the title to be placed near the top of the overview summary file. The title will be placed as a centered, level\-one heading directly beneath the upper navigation bar. The \f2title\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2title\fP may have to be escaped.
- .nf
- \f3
- .fl
-@@ -3126,11 +3134,11 @@
- .fl
- .fi
- .TP 3
--\-title\ title
--\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
-+\-title\ title
-+\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title.
- .TP 3
--\-header\ header
--Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped.
-+\-header\ header
-+Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped.
- .nf
- \f3
- .fl
-@@ -3138,17 +3146,17 @@
- .fl
- .fi
- .TP 3
--\-footer\ footer
--Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped.
-+\-footer\ footer
-+Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped.
- .TP 3
--\-top
--Specifies the text to be placed at the top of each output file.
-+\-top
-+Specifies the text to be placed at the top of each output file.
- .TP 3
--\-bottom\ text
--Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
-+\-bottom\ text
-+Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped.
- .TP 3
--\-link\ extdocURL
--Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
-+\-link\ extdocURL
-+Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument:
- .RS 3
- .TP 2
- o
-@@ -3161,21 +3169,21 @@
- When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system.
- .br
- .br
--In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the
-+In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the
- .na
- \f2URL Memo\fP @
- .fi
--http://www.ietf.org/rfc/rfc1738.txt).
-+http://www.ietf.org/rfc/rfc1738.txt).
- .RS 3
- .TP 3
--Absolute http: based link:
--\f2\-link http://<host>/<directory>/<directory>/.../<name>\fP
-+Absolute http: based link:
-+\f2\-link http://<host>/<directory>/<directory>/.../<name>\fP
- .TP 3
--Absolute file: based link:
--\f2\-link file://<host>/<directory>/<directory>/.../<name>\fP
-+Absolute file: based link:
-+\f2\-link file://<host>/<directory>/<directory>/.../<name>\fP
- .TP 3
--Relative link:
--\f2\-link <directory>/<directory>/.../<name>\fP
-+Relative link:
-+\f2\-link <directory>/<directory>/.../<name>\fP
- .RE
- .RE
- You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents.
-@@ -3184,35 +3192,35 @@
- \f3Choosing between \-linkoffline and \-link\fP:
- .br
- .br
--Use \f2\-link\fP:
-+Use \f2\-link\fP:
- .RS 3
- .TP 2
- o
--when using a relative path to the external API document, or
-+when using a relative path to the external API document, or
- .TP 2
- o
--when using an absolute URL to the external API document, if your shell allows a program to open a connection to that URL for reading.
-+when using an absolute URL to the external API document, if your shell allows a program to open a connection to that URL for reading.
- .RE
--Use \f2\-linkoffline\fP:
-+Use \f2\-linkoffline\fP:
- .RS 3
- .TP 2
- o
--when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side.
-+when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side.
- .RE
- .br
- .br
--\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at
-+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at
- .na
--\f2http://download.oracle.com/javase/7/docs/api/\fP @
-+\f2http://docs.oracle.com/javase/7/docs/api/\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
-+http://docs.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.)
- .nf
- \f3
- .fl
-- % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
-+ % \fP\f3javadoc \-link http://docs.oracle.com/javase/7/docs/api/ com.mypackage\fP
- .fl
- .fi
--\f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running:
-+\f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running:
- .nf
- \f3
- .fl
-@@ -3234,7 +3242,7 @@
- Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets.
- .br
- .br
--\f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced:
-+\f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced:
- .RS 3
- .TP 2
- o
-@@ -3242,30 +3250,30 @@
- .br
- \f2import java.io.*;\fP
- .br
--In 1.3.x and 1.2.x, only an explicit import by name works \-\- a wildcard import statement does not work, nor does the automatic import \f2java.lang.*\fP.
-+In 1.3.x and 1.2.x, only an explicit import by name works \-\- a wildcard import statement does not work, nor does the automatic import \f2java.lang.*\fP.
- .TP 2
- o
- In a declaration:
- .br
- \f2void foo(File f) {}\fP
- .br
--The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement.
-+The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement.
- .RE
--An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
-+An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above.
- .br
- .br
- \f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL.
- .br
- .br
--For example, the package list for the Java SE 6 API is located at
-+For example, the package list for the Java SE 6 API is located at
- .na
--\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
-+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows:
-+http://docs.oracle.com/javase/7/docs/api/package\-list. and starts as follows:
- .nf
- \f3
- .fl
-- java.applet
-+ java.applet
- .fl
- java.awt
- .fl
-@@ -3304,9 +3312,9 @@
- \f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document.
- .br
- .br
--In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
-+In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist.
- .TP 3
--\-linkoffline\ extdocURL\ packagelistLoc
-+\-linkoffline\ extdocURL\ packagelistLoc
- This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection.
- .br
- .br
-@@ -3316,27 +3324,27 @@
- Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below.
- .br
- .br
--The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP:
-+The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP:
- .RS 3
- .TP 2
- o
--\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. If relative, the value should be the relative path from the destination directory (specified with \f2\-d\fP) to the root of the packages being linked to. For more details, see \f2extdocURL\fP in the \f2\-link\fP option.
-+\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. If relative, the value should be the relative path from the destination directory (specified with \f2\-d\fP) to the root of the packages being linked to. For more details, see \f2extdocURL\fP in the \f2\-link\fP option.
- .TP 2
- o
--\f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename.
-+\f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename.
- .RE
- You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
- .br
- .br
--\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
-+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://docs.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at
- .na
--\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
-+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
-+http://docs.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.)
- .nf
- \f3
- .fl
--% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
-+% \fP\f3javadoc \-linkoffline http://docs.oracle.com/javase/7/docs/api/ . com.mypackage\fP
- .fl
- .fi
- \f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
-@@ -3358,23 +3366,23 @@
- \f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places.
- .br
- .br
--First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update:
-+First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update:
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP
- .fl
- .fi
--When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
-+When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP.
- .TP 3
--\-linksource\
-+\-linksource\
- Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes.
- .br
- .br
- \f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links.
- .br
- .br
--Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button":
-+Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button":
- .nf
- \f3
- .fl
-@@ -3386,7 +3394,7 @@
- .fl
- \fP
- .fi
--and the link to the source code of the \f2getLabel()\fP method in the Button class would be on the word "getLabel":
-+and the link to the source code of the \f2getLabel()\fP method in the Button class would be on the word "getLabel":
- .nf
- \f3
- .fl
-@@ -3395,15 +3403,15 @@
- \fP
- .fi
- .TP 3
--\-group\ groupheading\ packagepattern:packagepattern:...
--Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP.
-+\-group\ groupheading\ packagepattern:packagepattern:...
-+Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP.
- .RS 3
- .TP 2
- o
--\f4groupheading\fP can be any text, and can include white space. This text is placed in the table heading for the group.
-+\f4groupheading\fP can be any text, and can include white space. This text is placed in the table heading for the group.
- .TP 2
- o
--\f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP).
-+\f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP).
- .RE
- \f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP
- .br
-@@ -3411,7 +3419,7 @@
- If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages".
- .br
- .br
--For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package.
-+For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package.
- .nf
- \f3
- .fl
-@@ -3422,44 +3430,44 @@
- java.lang java.lang.reflect java.util javax.servlet java.new\fP
- .fl
- .fi
--This results in the groupings:
-+This results in the groupings:
- .RS 3
- .TP 3
--Core Packages
--\f2java.lang\fP
--\f2java.lang.reflect\fP
--\f2java.util\fP
-+Core Packages
-+\f2java.lang\fP
-+\f2java.lang.reflect\fP
-+\f2java.util\fP
- .TP 3
--Extension Packages
--\f2javax.servlet\fP
-+Extension Packages
-+\f2javax.servlet\fP
- .TP 3
--Other Packages
--\f2java.new\fP
-+Other Packages
-+\f2java.new\fP
- .RE
- .TP 3
--\-nodeprecated
--Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
-+\-nodeprecated
-+Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
- .TP 3
--\-nodeprecatedlist
--Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
-+\-nodeprecatedlist
-+Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
- .TP 3
--\-nosince
--Omits from the generated docs the "Since" sections associated with the @since tags.
-+\-nosince
-+Omits from the generated docs the "Since" sections associated with the @since tags.
- .TP 3
--\-notree
--Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
-+\-notree
-+Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
- .TP 3
--\-noindex
--Omits the index from the generated docs. The index is produced by default.
-+\-noindex
-+Omits the index from the generated docs. The index is produced by default.
- .TP 3
--\-nohelp
--Omits the HELP link in the navigation bars at the top and bottom of each page of output.
-+\-nohelp
-+Omits the HELP link in the navigation bars at the top and bottom of each page of output.
- .TP 3
--\-nonavbar
--Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
-+\-nonavbar
-+Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
- .TP 3
--\-helpfile\ path/filename
--Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example:
-+\-helpfile\ path/filename
-+Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example:
- .nf
- \f3
- .fl
-@@ -3467,8 +3475,8 @@
- .fl
- .fi
- .TP 3
--\-stylesheetfile\ path/filename
--Specifies the path of an alternate HTML stylesheet file. Without this option, the Javadoc tool automatically creates a stylesheet file \f2stylesheet.css\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2stylesheet.css\fP. For example:
-+\-stylesheetfile\ path/filename
-+Specifies the path of an alternate HTML stylesheet file. Without this option, the Javadoc tool automatically creates a stylesheet file \f2stylesheet.css\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2stylesheet.css\fP. For example:
- .nf
- \f3
- .fl
-@@ -3476,22 +3484,22 @@
- .fl
- .fi
- .TP 3
--\-serialwarn
--Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
-+\-serialwarn
-+Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods.
- .TP 3
--\-charset\ name
--Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the
-+\-charset\ name
-+Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the
- .na
- \f2IANA Registry\fP @
- .fi
--http://www.iana.org/assignments/character\-sets. For example:
-+http://www.iana.org/assignments/character\-sets. For example:
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-charset "iso\-8859\-1" mypackage\fP
- .fl
- .fi
--would insert the following line in the head of every generated page:
-+would insert the following line in the head of every generated page:
- .nf
- \f3
- .fl
-@@ -3499,34 +3507,34 @@
- .fl
- \fP
- .fi
--This META tag is described in the
-+This META tag is described in the
- .na
- \f2HTML standard\fP @
- .fi
- http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321)
- .br
- .br
--Also see \-encoding and \-docencoding.
-+Also see \-encoding and \-docencoding.
- .TP 3
--\-docencoding\ name
--Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the
-+\-docencoding\ name
-+Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the
- .na
- \f2IANA Registry\fP @
- .fi
--http://www.iana.org/assignments/character\-sets. If you omit this option but use \-encoding, then the encoding of the generated HTML files is determined by \-encoding. Example:
-+http://www.iana.org/assignments/character\-sets. If you omit this option but use \-encoding, then the encoding of the generated HTML files is determined by \-encoding. Example:
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP
- .fl
- .fi
--Also see \-encoding and \-charset.
-+Also see \-encoding and \-charset.
- .TP 3
--\-keywords
-+\-keywords
- Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.)
- .br
- .br
--The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords:
-+The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords:
- .nf
- \f3
- .fl
-@@ -3541,7 +3549,7 @@
- \fP
- .fi
- .TP 3
--\-tag\ \ tagname:Xaoptcmf:"taghead"
-+\-tag\ \ tagname:Xaoptcmf:"taghead"
- Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run.
- .br
- .br
-@@ -3568,10 +3576,10 @@
- .br
- \f4m\fP (methods)
- .br
--\f4f\fP (fields)
-+\f4f\fP (fields)
- .br
- .br
--\f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is:
-+\f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is:
- .nf
- \f3
- .fl
-@@ -3579,7 +3587,7 @@
- .fl
- \fP
- .fi
--If you wanted @todo to be used only with constructors, methods and fields, you would use:
-+If you wanted @todo to be used only with constructors, methods and fields, you would use:
- .nf
- \f3
- .fl
-@@ -3587,7 +3595,7 @@
- .fl
- \fP
- .fi
--Notice the last colon (\f2:\fP) above is not a parameter separator, but is part of the heading text (as shown below). You would use either tag option for source code that contains the tag \f2@todo\fP, such as:
-+Notice the last colon (\f2:\fP) above is not a parameter separator, but is part of the heading text (as shown below). You would use either tag option for source code that contains the tag \f2@todo\fP, such as:
- .nf
- \f3
- .fl
-@@ -3595,7 +3603,7 @@
- .fl
- \fP
- .fi
--\f3Use of Colon in Tag Name\fP \- A colon can be used in a tag name if it is escaped with a backslash. For this doc comment:
-+\f3Use of Colon in Tag Name\fP \- A colon can be used in a tag name if it is escaped with a backslash. For this doc comment:
- .nf
- \f3
- .fl
-@@ -3607,7 +3615,7 @@
- .fl
- \fP
- .fi
--use this tag option:
-+use this tag option:
- .nf
- \f3
- .fl
-@@ -3618,7 +3626,7 @@
- \f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases.
- .br
- .br
--You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use:
-+You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use:
- .nf
- \f3
- .fl
-@@ -3626,7 +3634,7 @@
- .fl
- \fP
- .fi
--or, if you'd rather keep it simple:
-+or, if you'd rather keep it simple:
- .nf
- \f3
- .fl
-@@ -3643,7 +3651,7 @@
- If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order.
- .br
- .br
--\f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed):
-+\f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed):
- .nf
- \f3
- .fl
-@@ -3670,24 +3678,24 @@
- \f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name.
- .br
- .br
--\f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See
-+\f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See
- .na
- \f2Comparing Annotations and Javadoc Tags\fP @
- .fi
- http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations<
- .br
- .br
--You can also create more complex block tags, or custom inline tags with the \-taglet option.
-+You can also create more complex block tags, or custom inline tags with the \-taglet option.
- .TP 3
--\-taglet\ \ class
--Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see:
-+\-taglet\ \ class
-+Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see:
- .RS 3
- .TP 2
- o
- .na
- \f2Taglet Overview\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html
- .RE
- Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
- .br
-@@ -3695,13 +3703,13 @@
- Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process.
- .br
- .br
--Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages:
-+Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages:
- .nf
- \f3
- .fl
- \-taglet com.sun.tools.doclets.ToDoTaglet
- .fl
-- \-tagletpath /home/taglets
-+ \-tagletpath /home/taglets
- .fl
- \-tag return
- .fl
-@@ -3715,22 +3723,22 @@
- .fl
- \fP
- .fi
--Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
-+Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
- .TP 3
--\-tagletpath\ \ tagletpathlist
--Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
-+\-tagletpath\ \ tagletpathlist
-+Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
- .TP 3
--\-docfilessubdirs\
--Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
-+\-docfilessubdirs\
-+Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
- .TP 3
--\-excludedocfilessubdir\ \ name1:name2...
--Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
-+\-excludedocfilessubdir\ \ name1:name2...
-+Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
- .TP 3
--\-noqualifier\ \ all\ | \ packagename1:packagename2:...
-+\-noqualifier\ \ all\ | \ packagename1:packagename2:...
- Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
- .br
- .br
--The following example omits all package qualifiers:
-+The following example omits all package qualifiers:
- .nf
- \f3
- .fl
-@@ -3738,7 +3746,7 @@
- .fl
- \fP
- .fi
--The following example omits "java.lang" and "java.io" package qualifiers:
-+The following example omits "java.lang" and "java.io" package qualifiers:
- .nf
- \f3
- .fl
-@@ -3746,7 +3754,7 @@
- .fl
- \fP
- .fi
--The following example omits package qualifiers starting with "java", and "com.sun" subpackages (but not "javax"):
-+The following example omits package qualifiers starting with "java", and "com.sun" subpackages (but not "javax"):
- .nf
- \f3
- .fl
-@@ -3754,10 +3762,10 @@
- .fl
- \fP
- .fi
--Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
-+Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used.
- .TP 3
--\-notimestamp\
--Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this:
-+\-notimestamp\
-+Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this:
- .nf
- \f3
- .fl
-@@ -3766,11 +3774,11 @@
- \fP
- .fi
- .TP 3
--\-nocomment\
--Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project.
-+\-nocomment\
-+Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project.
- .TP 3
--\-sourcetab tabLength
--Specify the number of spaces each tab takes up in the source.
-+\-sourcetab tabLength
-+Specify the number of spaces each tab takes up in the source.
- .RE
- .SH "COMMAND LINE ARGUMENT FILES"
- .LP
-@@ -3781,7 +3789,7 @@
- Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files.
- .LP
- When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list.
--.SS
-+.SS
- Example \- Single Arg File
- .LP
- You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments:
-@@ -3793,7 +3801,7 @@
- .fi
- .LP
- This argument file could contain the contents of both files shown in the next example.
--.SS
-+.SS
- Example \- Two Arg Files
- .LP
- You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.)
-@@ -3802,9 +3810,9 @@
- .nf
- \f3
- .fl
-- \-d docs\-filelist
-+ \-d docs\-filelist
- .fl
-- \-use
-+ \-use
- .fl
- \-splitindex
- .fl
-@@ -3845,7 +3853,7 @@
- % \fP\f3javadoc @options @packages\fP
- .fl
- .fi
--.SS
-+.SS
- Example \- Arg Files with Paths
- .LP
- The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP):
-@@ -3855,7 +3863,7 @@
- % \fP\f3javadoc @path1/options @path2/packages\fP
- .fl
- .fi
--.SS
-+.SS
- Example \- Option Arguments
- .LP
- Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument:
-@@ -3896,13 +3904,13 @@
- .LP
- \f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP.
- .LP
--\f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see
-+\f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see
- .na
- \f2Standard Doclet\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
- .LP
--\f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the
-+\f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the
- .na
- \f2MIF Doclet documentation\fP @
- .fi
-@@ -3910,7 +3918,7 @@
- .SH "SIMPLE EXAMPLES"
- .LP
- You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP.
--.SS
-+.SS
- Documenting One or More Packages
- .LP
- To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP.
-@@ -3919,7 +3927,7 @@
- .RS 3
- .TP 2
- o
--\f3Case 1 \- Run recursively starting from one or more packages\fP \- This example uses \-sourcepath so javadoc can be run from any directory and \-subpackages (a new 1.4 option) for recursion. It traverses the subpackages of the \f2java\fP directory excluding packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
-+\f3Case 1 \- Run recursively starting from one or more packages\fP \- This example uses \-sourcepath so javadoc can be run from any directory and \-subpackages (a new 1.4 option) for recursion. It traverses the subpackages of the \f2java\fP directory excluding packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP).
- .nf
- \f3
- .fl
-@@ -3927,10 +3935,10 @@
- .fl
- .fi
- .LP
--To also traverse down other package trees, append their names to the \f2\-subpackages\fP argument, such as \f2java:javax:org.xml.sax\fP.
-+To also traverse down other package trees, append their names to the \f2\-subpackages\fP argument, such as \f2java:javax:org.xml.sax\fP.
- .TP 2
- o
--\f3Case 2 \- Run on explicit packages after changing to the "root" source directory\fP \- Change to the parent directory of the fully\-qualified package. Then run javadoc, supplying names of one or more packages you want to document:
-+\f3Case 2 \- Run on explicit packages after changing to the "root" source directory\fP \- Change to the parent directory of the fully\-qualified package. Then run javadoc, supplying names of one or more packages you want to document:
- .nf
- \f3
- .fl
-@@ -3941,7 +3949,7 @@
- .fi
- .TP 2
- o
--\f3Case 3 \- Run from any directory on explicit packages in a single directory tree\fP \- In this case, it doesn't matter what the current directory is. Run javadoc supplying \f2\-sourcepath\fP with the parent directory of the top\-level package, and supplying names of one or more packages you want to document:
-+\f3Case 3 \- Run from any directory on explicit packages in a single directory tree\fP \- In this case, it doesn't matter what the current directory is. Run javadoc supplying \f2\-sourcepath\fP with the parent directory of the top\-level package, and supplying names of one or more packages you want to document:
- .nf
- \f3
- .fl
-@@ -3950,7 +3958,7 @@
- .fi
- .TP 2
- o
--\f3Case 4 \- Run from any directory on explicit packages in multiple directory trees\fP \- This is the same as case 3, but for packages in separate directory trees. Run javadoc supplying \f2\-sourcepath\fP with the path to each tree's root (colon\-separated) and supply names of one or more packages you want to document. All source files for a given package do not need to be located under a single root directory \-\- they just need to be found somewhere along the sourcepath.
-+\f3Case 4 \- Run from any directory on explicit packages in multiple directory trees\fP \- This is the same as case 3, but for packages in separate directory trees. Run javadoc supplying \f2\-sourcepath\fP with the path to each tree's root (colon\-separated) and supply names of one or more packages you want to document. All source files for a given package do not need to be located under a single root directory \-\- they just need to be found somewhere along the sourcepath.
- .nf
- \f3
- .fl
-@@ -3960,14 +3968,14 @@
- .RE
- .LP
- Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages.
--.SS
-+.SS
- Documenting One or More Classes
- .LP
- The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes.
- .RS 3
- .TP 2
- o
--\f3Case 1 \- Changing to the source directory\fP \- Change to the directory holding the \f2.java\fP files. Then run javadoc, supplying names of one or more source files you want to document.
-+\f3Case 1 \- Changing to the source directory\fP \- Change to the directory holding the \f2.java\fP files. Then run javadoc, supplying names of one or more source files you want to document.
- .nf
- \f3
- .fl
-@@ -3976,10 +3984,10 @@
- % \f3javadoc \-d /home/html Button.java Canvas.java Graphics*.java\fP
- .fl
- .fi
--This example generates HTML\-formatted documentation for the classes \f2Button\fP, \f2Canvas\fP and classes beginning with \f2Graphics\fP. Because source files rather than package names were passed in as arguments to javadoc, the document has two frames \-\- for the list of classes and the main page.
-+This example generates HTML\-formatted documentation for the classes \f2Button\fP, \f2Canvas\fP and classes beginning with \f2Graphics\fP. Because source files rather than package names were passed in as arguments to javadoc, the document has two frames \-\- for the list of classes and the main page.
- .TP 2
- o
--\f3Case 2 \- Changing to the package root directory\fP \- This is useful for documenting individual source files from different subpackages off the same root. Change to the package root directory, and supply the source files with paths from the root.
-+\f3Case 2 \- Changing to the package root directory\fP \- This is useful for documenting individual source files from different subpackages off the same root. Change to the package root directory, and supply the source files with paths from the root.
- .nf
- \f3
- .fl
-@@ -3988,19 +3996,19 @@
- % \f3javadoc \-d /home/html java/awt/Button.java java/applet/Applet.java\fP
- .fl
- .fi
--This example generates HTML\-formatted documentation for the classes \f2Button\fP and \f2Applet\fP.
-+This example generates HTML\-formatted documentation for the classes \f2Button\fP and \f2Applet\fP.
- .TP 2
- o
--\f3Case 3 \- From any directory\fP \- In this case, it doesn't matter what the current directory is. Run javadoc supplying the absolute path (or path relative to the current directory) to the \f2.java\fP files you want to document.
-+\f3Case 3 \- From any directory\fP \- In this case, it doesn't matter what the current directory is. Run javadoc supplying the absolute path (or path relative to the current directory) to the \f2.java\fP files you want to document.
- .nf
- \f3
- .fl
- % \fP\f3javadoc \-d /home/html /home/src/java/awt/Button.java /home/src/java/awt/Graphics*.java\fP
- .fl
- .fi
--This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP.
-+This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP.
- .RE
--.SS
-+.SS
- Documenting Both Packages and Classes
- .LP
- You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes.
-@@ -4017,28 +4025,28 @@
- The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2.
- .LP
- The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory.
--.SS
-+.SS
- Command Line Example
- .LP
- The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation.
- .nf
- \f3
- .fl
--% javadoc \-sourcepath /java/jdk/src/share/classes \\
-+% javadoc \-sourcepath /java/jdk/src/share/classes \\
- .fl
-- \-overview /java/jdk/src/share/classes/overview.html \\
-+ \-overview /java/jdk/src/share/classes/overview.html \\
- .fl
-- \-d /java/jdk/build/api \\
-+ \-d /java/jdk/build/api \\
- .fl
-- \-use \\
-+ \-use \\
- .fl
-- \-splitIndex \\
-+ \-splitIndex \\
- .fl
-- \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
-+ \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
- .fl
-- \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
-+ \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
- .fl
-- \-header '<b>Java(TM) SE 7</b>' \\
-+ \-header '<b>Java(TM) SE 7</b>' \\
- .fl
- \-bottom '<font size="\-1">
- .fl
-@@ -4048,13 +4056,13 @@
- .fl
- Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
- .fl
-- Other names may be trademarks of their respective owners.</font>' \\
-+ Other names may be trademarks of their respective owners.</font>' \\
- .fl
-- \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
-+ \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
- .fl
-- \-group "Extension Packages" "javax.*" \\
-+ \-group "Extension Packages" "javax.*" \\
- .fl
-- \-J\-Xmx180m \\
-+ \-J\-Xmx180m \\
- .fl
- @packages
- .fl
-@@ -4062,10 +4070,10 @@
- .fi
- .LP
- where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below.
--.SS
-+.SS
- Makefile Example
- .LP
--This is an example of a GNU makefile. For an example of a Windows makefile, see
-+This is an example of a GNU makefile. For an example of a Windows makefile, see
- .na
- \f2creating a makefile for Windows\fP @
- .fi
-@@ -4099,11 +4107,11 @@
- .fl
- java.lang java.lang.reflect \\ /* Sets packages to document */
- .fl
-- java.util java.io java.net \\
-+ java.util java.io java.net \\
- .fl
- java.applet
- .fl
--
-+
- .fl
- WINDOWTITLE = 'Java(TM) SE 7 API Specification'
- .fl
-@@ -4136,91 +4144,91 @@
- .RS 3
- .TP 2
- o
--If you omit the \f2\-windowtitle\fP option, the Javadoc tool copies the doc title to the window title. The \f2\-windowtitle\fP text is basically the same as the \f2\-doctitle\fP but without HTML tags, to prevent those tags from appearing as raw text in the window title.
-+If you omit the \f2\-windowtitle\fP option, the Javadoc tool copies the doc title to the window title. The \f2\-windowtitle\fP text is basically the same as the \f2\-doctitle\fP but without HTML tags, to prevent those tags from appearing as raw text in the window title.
- .TP 2
- o
--If you omit the \f2\-footer\fP option, as done here, the Javadoc tool copies the header text to the footer.
-+If you omit the \f2\-footer\fP option, as done here, the Javadoc tool copies the header text to the footer.
- .TP 2
- o
--Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP.
-+Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP.
- .RE
- .SH "TROUBLESHOOTING"
--.SS
-+.SS
- General Troubleshooting
- .RS 3
- .TP 2
- o
--\f3Javadoc FAQ\fP \- Commonly\-encountered bugs and troubleshooting tips can be found on the
-+\f3Javadoc FAQ\fP \- Commonly\-encountered bugs and troubleshooting tips can be found on the
- .na
- \f2Javadoc FAQ\fP @
- .fi
--http://java.sun.com/j2se/javadoc/faq/index.html#B
-+http://java.sun.com/j2se/javadoc/faq/index.html#B
- .TP 2
- o
--\f3Bugs and Limitations\fP \- You can also see some bugs listed at Important Bug Fixes and Changes.
-+\f3Bugs and Limitations\fP \- You can also see some bugs listed at Important Bug Fixes and Changes.
- .TP 2
- o
--\f3Version number\fP \- See version numbers.
-+\f3Version number\fP \- See version numbers.
- .TP 2
- o
--\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename.
-+\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename.
- .RE
--.SS
-+.SS
- Errors and Warnings
- .LP
- Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment.
- .RS 3
- .TP 2
- o
--\f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP.
-+\f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP.
- .RE
- .SH "ENVIRONMENT"
- .RS 3
- .TP 3
--CLASSPATH
--Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example:
--.:/home/classes:/usr/local/java/classes
-+CLASSPATH
-+Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example:
-+.:/home/classes:/usr/local/java/classes
- .RE
- .SH "SEE ALSO"
- .RS 3
- .TP 2
- o
--javac(1)
-+javac(1)
- .TP 2
- o
--java(1)
-+java(1)
- .TP 2
- o
--jdb(1)
-+jdb(1)
- .TP 2
- o
--javah(1)
-+javah(1)
- .TP 2
- o
--javap(1)
-+javap(1)
- .TP 2
- o
- .na
- \f2Javadoc Home Page\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html
- .TP 2
- o
- .na
- \f2How to Write Doc Comments for Javadoc\fP @
- .fi
--http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html
- .TP 2
- o
- .na
- \f2Setting the Class Path\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general
- .TP 2
- o
- .na
- \f2How Javac and Javadoc Find Classes\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
-+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar)
- .RE
--
-+
---- jdk/src/bsd/doc/man/javah.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/javah.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH javah 1 "10 May 2011"
-+.TH javah 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -57,29 +57,29 @@
- .LP
- .RS 3
- .TP 3
--\-o outputfile
--Concatenates the resulting header or source files for all the classes listed on the command line into \f2outputfile\fP. Only one of \f3\-o\fP or \f3\-d\fP may be used.
-+\-o outputfile
-+Concatenates the resulting header or source files for all the classes listed on the command line into \f2outputfile\fP. Only one of \f3\-o\fP or \f3\-d\fP may be used.
- .TP 3
--\-d directory
--Sets the directory where \f3javah\fP saves the header files or the stub files. Only one of \f3\-d\fP or \f3\-o\fP may be used.
-+\-d directory
-+Sets the directory where \f3javah\fP saves the header files or the stub files. Only one of \f3\-d\fP or \f3\-o\fP may be used.
- .TP 3
--\-stubs
--Causes \f3javah\fP to generate C declarations from the Java object file.
-+\-stubs
-+Causes \f3javah\fP to generate C declarations from the Java object file.
- .TP 3
--\-verbose
--Indicates verbose output and causes \f3javah\fP to print a message to stdout concerning the status of the generated files.
-+\-verbose
-+Indicates verbose output and causes \f3javah\fP to print a message to stdout concerning the status of the generated files.
- .TP 3
--\-help
--Print help message for \f3javah\fP usage.
-+\-help
-+Print help message for \f3javah\fP usage.
- .TP 3
--\-version
--Print out \f3javah\fP version information.
-+\-version
-+Print out \f3javah\fP version information.
- .TP 3
--\-jni
--Causes \f3javah\fP to create an output file containing JNI\-style native method function prototypes. This is the default output, so use of \f3\-jni\fP is optional.
-+\-jni
-+Causes \f3javah\fP to create an output file containing JNI\-style native method function prototypes. This is the default output, so use of \f3\-jni\fP is optional.
- .TP 3
--\-classpath path
--Specifies the path \f3javah\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-+\-classpath path
-+Specifies the path \f3javah\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
- .nf
- \f3
- .fl
-@@ -87,7 +87,7 @@
- .fl
- \fP
- .fi
--For example:
-+For example:
- .nf
- \f3
- .fl
-@@ -98,19 +98,19 @@
- 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.
-+\-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.
- .TP 3
--\-old
--Specifies that old JDK1.0\-style header files should be generated.
-+\-old
-+Specifies that old JDK1.0\-style header files should be generated.
- .TP 3
--\-force
--Specifies that output files should always be written.
-+\-force
-+Specifies that output files should always be written.
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
- .RE
-
- .LP
-@@ -118,8 +118,8 @@
- .LP
- .RS 3
- .TP 3
--CLASSPATH
--Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example,
-+CLASSPATH
-+Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example,
- .nf
- \f3
- .fl
-@@ -135,4 +135,4 @@
- .LP
- javac(1), java(1), jdb(1), javap(1), javadoc(1)
- .LP
--
-+
---- jdk/src/bsd/doc/man/javap.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/javap.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH javap 1 "10 May 2011"
-+.TH javap 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -46,11 +46,11 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options.
-+options
-+Command\-line options.
- .TP 3
--classes
--List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP).
-+classes
-+List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP).
- .RE
-
- .LP
-@@ -148,11 +148,11 @@
- .fl
- Code:
- .fl
-- 0: aload_0
-+ 0: aload_0
- .fl
- 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
- .fl
-- 4: return
-+ 4: return
- .fl
-
- .fl
-@@ -160,7 +160,7 @@
- .fl
- Code:
- .fl
-- 0: aload_0
-+ 0: aload_0
- .fl
- 1: sipush 500
- .fl
-@@ -168,9 +168,9 @@
- .fl
- 6: invokevirtual #2 // Method resize:(II)V
- .fl
-- 9: aload_0
-+ 9: aload_0
- .fl
-- 10: aload_0
-+ 10: aload_0
- .fl
- 11: ldc #3 // String LAST_UPDATED
- .fl
-@@ -178,9 +178,9 @@
- .fl
- 16: putfield #5 // Field date:Ljava/lang/String;
- .fl
-- 19: aload_0
-+ 19: aload_0
- .fl
-- 20: aload_0
-+ 20: aload_0
- .fl
- 21: ldc #6 // String EMAIL
- .fl
-@@ -188,7 +188,7 @@
- .fl
- 26: putfield #7 // Field email:Ljava/lang/String;
- .fl
-- 29: return
-+ 29: return
- .fl
-
- .fl
-@@ -196,21 +196,21 @@
- .fl
- Code:
- .fl
-- 0: aload_1
-+ 0: aload_1
- .fl
- 1: new #8 // class java/lang/StringBuilder
- .fl
-- 4: dup
-+ 4: dup
- .fl
- 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
- .fl
-- 8: aload_0
-+ 8: aload_0
- .fl
- 9: getfield #5 // Field date:Ljava/lang/String;
- .fl
- 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/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
- .fl
-@@ -222,9 +222,9 @@
- .fl
- 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 email:Ljava/lang/String;
- .fl
-@@ -234,7 +234,7 @@
- .fl
- 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
- .fl
-- 43: return
-+ 43: return
- .fl
- }
- .fl
-@@ -246,29 +246,29 @@
- .LP
- .RS 3
- .TP 3
--\-help \-\-help \-?
--Prints out help message for \f3javap\fP.
-+\-help \-\-help \-?
-+Prints out help message for \f3javap\fP.
- .TP 3
--\-version
--Prints out version information.
-+\-version
-+Prints out version information.
- .TP 3
--\-l
--Prints out line and local variable tables.
-+\-l
-+Prints out line and local variable tables.
- .TP 3
--\-public
--Shows only public classes and members.
-+\-public
-+Shows only public classes and members.
- .TP 3
--\-protected
--Shows only protected and public classes and members.
-+\-protected
-+Shows only protected and public classes and members.
- .TP 3
--\-package
--Shows only package, protected, and public classes and members. This is the default.
-+\-package
-+Shows only package, protected, and public classes and members. This is the default.
- .TP 3
--\-private \-p
--Shows all classes and members.
-+\-private \-p
-+Shows all classes and members.
- .TP 3
--\-Jflag
--Pass \f2flag\fP directly to the runtime system. Some examples:
-+\-Jflag
-+Pass \f2flag\fP directly to the runtime system. Some examples:
- .nf
- \f3
- .fl
-@@ -279,33 +279,33 @@
- \fP
- .fi
- .TP 3
--\-s
--Prints internal type signatures.
-+\-s
-+Prints internal type signatures.
- .TP 3
--\-sysinfo
--Shows system information (path, size, date, MD5 hash) of the class being processed.
-+\-sysinfo
-+Shows system information (path, size, date, MD5 hash) of the class being processed.
- .TP 3
--\-constants
--Shows static final constants.
-+\-constants
-+Shows static final constants.
- .TP 3
--\-c
--Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the
-+\-c
-+Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the
- .na
- \f2Java Virtual Machine Specification\fP @
- .fi
--http://java.sun.com/docs/books/vmspec/.
-+http://java.sun.com/docs/books/vmspec/.
- .TP 3
--\-verbose
--Prints stack size, number of \f2locals\fP and \f2args\fP for methods.
-+\-verbose
-+Prints stack size, number of \f2locals\fP and \f2args\fP for methods.
- .TP 3
--\-classpath path
--Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set.
-+\-classpath path
-+Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set.
- .TP 3
--\-bootclasspath path
--Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files.
-+\-bootclasspath path
-+Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files.
- .TP 3
--\-extdirs dirs
--Overrides location at which installed extensions are searched for. The default location for extensions is the value of \f2java.ext.dirs\fP.
-+\-extdirs dirs
-+Overrides location at which installed extensions are searched for. The default location for extensions is the value of \f2java.ext.dirs\fP.
- .RE
-
- .LP
-@@ -314,4 +314,4 @@
- .LP
- javac(1), java(1), jdb(1), javah(1), javadoc(1)
- .LP
--
-+
---- jdk/src/bsd/doc/man/javaws.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/javaws.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH javaws 1 "10 May 2011"
-+.TH javaws 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -204,19 +204,19 @@
- .SH "FILES"
- .LP
- .LP
--For information about the user and system cache and deployment.properties files, see
-+For information about the user and system cache and deployment.properties files, see
- .na
- \f2System\- and User\-Level Properties\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
- .LP
- .SH "MORE INFORMATION"
- .LP
- .LP
--For more information about Java Web Start, see
-+For more information about Java Web Start, see
- .na
- \f2Java Web Start\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
- .LP
--
-+
---- jdk/src/bsd/doc/man/jconsole.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jconsole.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jconsole 1 "10 May 2011"
-+.TH jconsole 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -41,32 +41,32 @@
- .LP
- .RS 3
- .TP 3
--options
--Options, if used, should follow immediately after the command name.
-+options
-+Options, if used, should follow immediately after the command name.
- .TP 3
--connection = pid | host:port | jmxUrl
-+connection = pid | host:port | jmxUrl
- .RS 3
- .TP 2
- o
--\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
-+\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See
- .na
- \f2JMX Monitoring and Management\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
- .TP 2
- o
--\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
-+\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See
- .na
- \f2JMX Monitoring and Management\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details.
- .TP 2
- o
--\f2jmxUrl\fP Address of the JMX agent to be connected to as described in
-+\f2jmxUrl\fP Address of the JMX agent to be connected to as described in
- .na
- \f2JMXServiceURL\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html.
-+http://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html.
- .RE
- .RE
-
-@@ -83,13 +83,13 @@
- .LP
- .RS 3
- .TP 3
--\-interval=n
--Set the update interval to \f2n\fP seconds (default is 4 seconds).
-+\-interval=n
-+Set the update interval to \f2n\fP seconds (default is 4 seconds).
- .TP 3
--\-notile
--Do not tile windows initially (for two or more connections).
-+\-notile
-+Do not tile windows initially (for two or more connections).
- .TP 3
--\-pluginpath plugins
-+\-pluginpath plugins
- Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named:
- .br
- .nf
-@@ -99,20 +99,20 @@
- .fl
- \fP
- .fi
--containing one line for each plugin specifying the fully qualified class name of the class implementing the
-+containing one line for each plugin specifying the fully qualified class name of the class implementing the
- .na
- \f2com.sun.tools.jconsole.JConsolePlugin\fP @
- .fi
--http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
-+http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
- .TP 3
--\-version
--Output version information and exit.
-+\-version
-+Output version information and exit.
- .TP 3
--\-help
--Output help message and exit.
-+\-help
-+Output help message and exit.
- .TP 3
--\-J<flag>
--Pass <flag> to the Java virtual machine on which jconsole is run.
-+\-J<flag>
-+Pass <flag> to the Java virtual machine on which jconsole is run.
- .RE
-
- .LP
-@@ -124,14 +124,14 @@
- .na
- \f2Using JConsole\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html
- .TP 2
- o
- .na
- \f2Monitoring and Management for Java Platform\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/management/index.html
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jdb.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jdb.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jdb 1 "10 May 2011"
-+.TH jdb 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -33,34 +33,34 @@
- .nf
- \f3
- .fl
--\fP\f3jdb\fP [ options ] [ class ] [ arguments ]
-+\fP\f3jdb\fP [ options ] [ class ] [ arguments ]
- .fl
- .fi
-
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options, as specified below.
-+options
-+Command\-line options, as specified below.
- .TP 3
--class
--Name of the class to begin debugging.
-+class
-+Name of the class to begin debugging.
- .TP 3
--arguments
--Arguments passed to the \f2main()\fP method of \f2class\fP.
-+arguments
-+Arguments passed to the \f2main()\fP method of \f2class\fP.
- .RE
-
- .LP
- .SH "DESCRIPTION"
- .LP
- .LP
--The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the
-+The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the
- .na
- \f2Java Platform Debugger Architecture\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
- .LP
--.SS
-+.SS
- Starting a jdb Session
- .LP
- .LP
-@@ -69,7 +69,7 @@
- .nf
- \f3
- .fl
-- % jdb MyClass
-+ % jdb MyClass
- .fl
- \fP
- .fi
-@@ -108,7 +108,7 @@
- .nf
- \f3
- .fl
-- % jdb \-attach 8000
-+ % jdb \-attach 8000
- .fl
- \fP
- .fi
-@@ -118,17 +118,17 @@
- Note that "MyClass" is not specified in the \f3jdb\fP command line in this case because \f3jdb\fP is connecting to an existing VM instead of launching a new one.
- .LP
- .LP
--There are many other ways to connect the debugger to a VM, and all of them are supported by \f3jdb\fP. The Java Platform Debugger Architecture has additional
-+There are many other ways to connect the debugger to a VM, and all of them are supported by \f3jdb\fP. The Java Platform Debugger Architecture has additional
- .na
- \f2documentation\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the
- .na
- \f21.4.2 documentation\fP @
- .fi
- http://java.sun.com/j2se/1.4.2/docs/guide/jpda/conninv.html
- .LP
--.SS
-+.SS
- Basic jdb Commands
- .LP
- .LP
-@@ -136,49 +136,49 @@
- .LP
- .RS 3
- .TP 3
--help, or ?
--The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description.
-+help, or ?
-+The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description.
- .TP 3
--run
--After starting \f3jdb\fP, and setting any necessary breakpoints, you can use this command to start the execution the debugged application. This command is available only when \f3jdb\fP launches the debugged application (as opposed to attaching to an existing VM).
-+run
-+After starting \f3jdb\fP, and setting any necessary breakpoints, you can use this command to start the execution the debugged application. This command is available only when \f3jdb\fP launches the debugged application (as opposed to attaching to an existing VM).
- .TP 3
--cont
--Continues execution of the debugged application after a breakpoint, exception, or step.
-+cont
-+Continues execution of the debugged application after a breakpoint, exception, or step.
- .TP 3
--print
-+print
- Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object.
- .br
- .br
- \f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option.
- .br
- .br
--\f2print\fP supports many simple Java expressions including those with method invocations, for example:
-+\f2print\fP supports many simple Java expressions including those with method invocations, for example:
- .RS 3
- .TP 2
- o
--\f2print MyClass.myStaticField\fP
-+\f2print MyClass.myStaticField\fP
- .TP 2
- o
--\f2print myObj.myInstanceField\fP
-+\f2print myObj.myInstanceField\fP
- .TP 2
- o
--\f2print i + j + k\fP \f2(i, j, k are primities and either fields or local variables)\fP
-+\f2print i + j + k\fP \f2(i, j, k are primities and either fields or local variables)\fP
- .TP 2
- o
--\f2print myObj.myMethod()\fP \f2(if myMethod returns a non\-null)\fP
-+\f2print myObj.myMethod()\fP \f2(if myMethod returns a non\-null)\fP
- .TP 2
- o
--\f2print new java.lang.String("Hello").length()\fP
-+\f2print new java.lang.String("Hello").length()\fP
- .RE
- .TP 3
--dump
-+dump
- For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included.
- .br
- .br
--The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
-+The \f2dump\fP command supports the same set of expressions as the \f2print\fP command.
- .TP 3
--threads
--List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example:
-+threads
-+List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example:
- .nf
- \f3
- .fl
-@@ -186,20 +186,20 @@
- .fl
- \fP
- .fi
--In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running,
-+In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running,
- .TP 3
--thread
--Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above.
-+thread
-+Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above.
- .TP 3
--where
-+where
- \f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread.
- .br
- .br
--If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
-+If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current.
- .RE
-
- .LP
--.SS
-+.SS
- Breakpoints
- .LP
- .LP
-@@ -208,16 +208,16 @@
- .RS 3
- .TP 2
- o
--\f2stop at MyClass:22\fP \f2(sets a breakpoint at the first instruction for line 22 of the source file containing MyClass)\fP
-+\f2stop at MyClass:22\fP \f2(sets a breakpoint at the first instruction for line 22 of the source file containing MyClass)\fP
- .TP 2
- o
--\f2stop in java.lang.String.length\fP \f2(sets a breakpoint at the beginnig of the method \fP\f2java.lang.String.length\fP)
-+\f2stop in java.lang.String.length\fP \f2(sets a breakpoint at the beginnig of the method \fP\f2java.lang.String.length\fP)
- .TP 2
- o
--\f2stop in MyClass.<init>\fP \f2(<init> identifies the MyClass constructor)\fP
-+\f2stop in MyClass.<init>\fP \f2(<init> identifies the MyClass constructor)\fP
- .TP 2
- o
--\f2stop in MyClass.<clinit>\fP \f2(<clinit> identifies the static initialization code for MyClass)\fP
-+\f2stop in MyClass.<clinit>\fP \f2(<clinit> identifies the static initialization code for MyClass)\fP
- .RE
-
- .LP
-@@ -227,13 +227,13 @@
- .LP
- The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution.
- .LP
--.SS
-+.SS
- Stepping
- .LP
- .LP
- The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame.
- .LP
--.SS
-+.SS
- Exceptions
- .LP
- .LP
-@@ -258,67 +258,67 @@
- .LP
- .RS 3
- .TP 3
--\-help
--Displays a help message.
-+\-help
-+Displays a help message.
- .TP 3
--\-sourcepath <dir1:dir2:...>
--Uses the given path in searching for source files in the specified path. If this option is not specified, the default path of "." is used.
-+\-sourcepath <dir1:dir2:...>
-+Uses the given path in searching for source files in the specified path. If this option is not specified, the default path of "." is used.
- .TP 3
--\-attach <address>
--Attaches the debugger to previously running VM using the default connection mechanism.
-+\-attach <address>
-+Attaches the debugger to previously running VM using the default connection mechanism.
- .TP 3
--\-listen <address>
--Waits for a running VM to connect at the specified address using standard connector.
-+\-listen <address>
-+Waits for a running VM to connect at the specified address using standard connector.
- .TP 3
--\-listenany
--Waits for a running VM to connect at any available address using standard connector.
-+\-listenany
-+Waits for a running VM to connect at any available address using standard connector.
- .TP 3
--\-launch
--Launches the debugged application immediately upon startup of jdb. This option removes the need for using the \f2run\fP command. The debuged application is launched and then stopped just before the initial application class is loaded. At that point you can set any necessary breakpoints and use the \f2cont\fP to continue execution.
-+\-launch
-+Launches the debugged application immediately upon startup of jdb. This option removes the need for using the \f2run\fP command. The debuged application is launched and then stopped just before the initial application class is loaded. At that point you can set any necessary breakpoints and use the \f2cont\fP to continue execution.
- .TP 3
--\-listconnectors
--List the connectors available in this VM
-+\-listconnectors
-+List the connectors available in this VM
- .TP 3
--\-connect <connector\-name>:<name1>=<value1>,...
--Connects to target VM using named connector with listed argument values.
-+\-connect <connector\-name>:<name1>=<value1>,...
-+Connects to target VM using named connector with listed argument values.
- .TP 3
--\-dbgtrace [flags]
--Prints info for debugging jdb.
-+\-dbgtrace [flags]
-+Prints info for debugging jdb.
- .TP 3
--\-tclient
--Runs the application in the Java HotSpot(tm) VM (Client).
-+\-tclient
-+Runs the application in the Java HotSpot(tm) VM (Client).
- .TP 3
--\-tserver
--Runs the application in the Java HotSpot(tm) VM (Server).
-+\-tserver
-+Runs the application in the Java HotSpot(tm) VM (Server).
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine used to run jdb. (Options for the application Java virtual machine are passed to the \f3run\fP command.) For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine used to run jdb. (Options for the application Java virtual machine are passed to the \f3run\fP command.) For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
- .RE
-
- .LP
- .LP
--Other options are supported for alternate mechanisms for connecting the debugger and the VM it is to debug. The Java Platform Debugger Architecture has additional
-+Other options are supported for alternate mechanisms for connecting the debugger and the VM it is to debug. The Java Platform Debugger Architecture has additional
- .na
- \f2documentation\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
- .LP
--.SS
-+.SS
- Options Forwarded to Debuggee Process
- .LP
- .RS 3
- .TP 3
--\-v \-verbose[:class|gc|jni]
--Turns on verbose mode.
-+\-v \-verbose[:class|gc|jni]
-+Turns on verbose mode.
- .TP 3
--\-D<name>=<value>
--Sets a system property.
-+\-D<name>=<value>
-+Sets a system property.
- .TP 3
--\-classpath <directories separated by ":">
--Lists directories in which to look for classes.
-+\-classpath <directories separated by ":">
-+Lists directories in which to look for classes.
- .TP 3
--\-X<option>
--Non\-standard target VM option
-+\-X<option>
-+Non\-standard target VM option
- .RE
-
- .LP
-@@ -327,4 +327,4 @@
- .LP
- javac(1), java(1), javah(1), javap(1), javadoc(1).
- .LP
--
-+
---- jdk/src/bsd/doc/man/jhat.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jhat.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jhat 1 "10 May 2011"
-+.TH jhat 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -41,11 +41,11 @@
- .LP
- .RS 3
- .TP 3
--options
--Options, if used, should follow immediately after the command name.
-+options
-+Options, if used, should follow immediately after the command name.
- .TP 3
--heap\-dump\-file
--Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3".
-+heap\-dump\-file
-+Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3".
- .RE
-
- .LP
-@@ -60,24 +60,24 @@
- .RS 3
- .TP 2
- o
--Use jmap(1) \-dump option to obtain a heap dump at runtime;
-+Use jmap(1) \-dump option to obtain a heap dump at runtime;
- .TP 2
- o
--Use jconsole(1) option to obtain a heap dump via
-+Use jconsole(1) option to obtain a heap dump via
- .na
- \f2HotSpotDiagnosticMXBean\fP @
- .fi
--http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
-+http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime;
- .TP 2
- o
--Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option;
-+Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option;
- .TP 2
- o
--Use
-+Use
- .na
- \f2hprof\fP @
- .fi
--http://java.sun.com/developer/technicalArticles/Programming/HPROF.html.
-+http://java.sun.com/developer/technicalArticles/Programming/HPROF.html.
- .RE
-
- .LP
-@@ -88,35 +88,35 @@
- .LP
- .RS 3
- .TP 3
--\-stack false/true
--Turn off tracking object allocation call stack. Note that if allocation site information is not available in the heap dump, you have to set this flag to false. Default is true.
-+\-stack false/true
-+Turn off tracking object allocation call stack. Note that if allocation site information is not available in the heap dump, you have to set this flag to false. Default is true.
- .TP 3
--\-refs false/true
--Turn off tracking of references to objects. Default is true. By default, back pointers (objects pointing to a given object a.k.a referrers or in\-coming references) are calculated for all objects in the heap.
-+\-refs false/true
-+Turn off tracking of references to objects. Default is true. By default, back pointers (objects pointing to a given object a.k.a referrers or in\-coming references) are calculated for all objects in the heap.
- .TP 3
--\-port port\-number
--Set the port for the jhat's HTTP server. Default is 7000.
-+\-port port\-number
-+Set the port for the jhat's HTTP server. Default is 7000.
- .TP 3
--\-exclude exclude\-file
--Specify a file that lists data members that should be excluded from the "reachable objects" query. For example, if the file lists \f2java.lang.String.value\fP, then, whenever list of objects reachable from a specific object "o" are calculated, reference paths involving \f2java.lang.String.value\fP field will not considered.
-+\-exclude exclude\-file
-+Specify a file that lists data members that should be excluded from the "reachable objects" query. For example, if the file lists \f2java.lang.String.value\fP, then, whenever list of objects reachable from a specific object "o" are calculated, reference paths involving \f2java.lang.String.value\fP field will not considered.
- .TP 3
--\-baseline baseline\-dump\-file
--Specify a baseline heap dump. Objects in both heap dumps with the same object ID will be marked as not being "new". Other objects will be marked as "new". This is useful while comparing two different heap dumps.
-+\-baseline baseline\-dump\-file
-+Specify a baseline heap dump. Objects in both heap dumps with the same object ID will be marked as not being "new". Other objects will be marked as "new". This is useful while comparing two different heap dumps.
- .TP 3
--\-debug int
--Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes.
-+\-debug int
-+Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes.
- .TP 3
--\-version
--Report version number and exit.
-+\-version
-+Report version number and exit.
- .TP 3
--\-h
--Output help message and exit.
-+\-h
-+Output help message and exit.
- .TP 3
--\-help
--Output help message and exit.
-+\-help
-+Output help message and exit.
- .TP 3
--\-J<flag>
--Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB.
-+\-J<flag>
-+Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB.
- .RE
-
- .LP
-@@ -125,17 +125,17 @@
- .RS 3
- .TP 2
- o
--jmap(1)
-+jmap(1)
- .TP 2
- o
--jconsole(1)
-+jconsole(1)
- .TP 2
- o
- .na
- \f2hprof \- Heap and CPU profiling tool\fP @
- .fi
--http://java.sun.com/developer/technicalArticles/Programming/HPROF.html
-+http://java.sun.com/developer/technicalArticles/Programming/HPROF.html
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jinfo.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jinfo.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jinfo 1 "10 May 2011"
-+.TH jinfo 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -34,7 +34,7 @@
- .fl
- \f3jinfo\fP [ option ] executable core
- .fl
--\f3jinfo\fP [ option ] [server\-id@]remote\-hostname\-or\-IP
-+\f3jinfo\fP [ option ] [server\-id@]remote\-hostname\-or\-IP
- .fl
- .fi
-
-@@ -43,43 +43,43 @@
- .LP
- .RS 3
- .TP 3
--option
--Options are mutually exclusive. Option, if used, should follow immediately after the command name.
-+option
-+Options are mutually exclusive. Option, if used, should follow immediately after the command name.
- .RE
-
- .LP
- .RS 3
- .TP 3
--pid
--process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
-+pid
-+process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
- .RE
-
- .LP
- .RS 3
- .TP 3
--executable
--Java executable from which the core dump was produced.
-+executable
-+Java executable from which the core dump was produced.
- .RE
-
- .LP
- .RS 3
- .TP 3
--core
--core file for which the configuration info is to be printed.
-+core
-+core file for which the configuration info is to be printed.
- .RE
-
- .LP
- .RS 3
- .TP 3
--remote\-hostname\-or\-IP
--remote debug server's (see jsadebugd(1)) hostname or IP address.
-+remote\-hostname\-or\-IP
-+remote debug server's (see jsadebugd(1)) hostname or IP address.
- .RE
-
- .LP
- .RS 3
- .TP 3
--server\-id
--optional unique id, if multiple debug servers are running on the same remote host.
-+server\-id
-+optional unique id, if multiple debug servers are running on the same remote host.
- .RE
-
- .LP
-@@ -100,35 +100,35 @@
- .LP
- .RS 3
- .TP 3
--<no option>
-+<no option>
- prints both command line flags as well as System properties name, value pairs.
- .br
- .TP 3
--\-flag name
-+\-flag name
- prints the name and value of the given command line flag.
- .br
- .TP 3
--\-flag [+|\-]name
-+\-flag [+|\-]name
- enables or disables the given boolean command line flag.
- .br
- .TP 3
--\-flag name=value
-+\-flag name=value
- sets the given command line flag to the specified value.
- .br
- .TP 3
--\-flags
-+\-flags
- prints command line flags passed to the JVM. pairs.
- .br
- .TP 3
--\-sysprops
-+\-sysprops
- prints Java System properties as name, value pairs.
- .br
- .TP 3
--\-h
--prints a help message
-+\-h
-+prints a help message
- .TP 3
--\-help
--prints a help message
-+\-help
-+prints a help message
- .RE
-
- .LP
-@@ -137,11 +137,11 @@
- .RS 3
- .TP 2
- o
--jps(1)
-+jps(1)
- .TP 2
- o
--jsadebugd(1)
-+jsadebugd(1)
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jmap.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jmap.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jmap 1 "10 May 2011"
-+.TH jmap 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -43,26 +43,26 @@
- .LP
- .RS 3
- .TP 3
--option
--Options are mutually exclusive. Option, if used, should follow immediately after the command name.
-+option
-+Options are mutually exclusive. Option, if used, should follow immediately after the command name.
- .TP 3
--pid
--process id for which the memory map is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
-+pid
-+process id for which the memory map is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
- .br
- .TP 3
--executable
--Java executable from which the core dump was produced.
-+executable
-+Java executable from which the core dump was produced.
- .br
- .TP 3
--core
--core file for which the memory map is to be printed.
-+core
-+core file for which the memory map is to be printed.
- .br
- .TP 3
--remote\-hostname\-or\-IP
--remote debug server's (see jsadebugd(1)) hostname or IP address.
-+remote\-hostname\-or\-IP
-+remote debug server's (see jsadebugd(1)) hostname or IP address.
- .br
- .TP 3
--server\-id
-+server\-id
- optional unique id, if multiple debug servers are running on the same remote host.
- .br
- .RE
-@@ -95,46 +95,46 @@
- .LP
- .RS 3
- .TP 3
--<no option>
--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.
-+<no option>
-+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>
--Dumps the Java heap in hprof binary format to filename. The \f2live\fP suboption is optional. If specified, only the live objects in the heap are dumped. To browse the heap dump, you can use jhat(1) (Java Heap Analysis Tool) to read the generated file.
-+\-dump:[live,]format=b,file=<filename>
-+Dumps the Java heap in hprof binary format to filename. The \f2live\fP suboption is optional. If specified, only the live objects in the heap are dumped. To browse the heap dump, you can use jhat(1) (Java Heap Analysis Tool) to read the generated file.
- .br
- .TP 3
--\-finalizerinfo
--Prints information on objects awaiting finalization.
-+\-finalizerinfo
-+Prints information on objects awaiting finalization.
- .br
- .TP 3
--\-heap
--Prints a heap summary. GC algorithm used, heap configuration and generation wise heap usage are printed.
-+\-heap
-+Prints a heap summary. GC algorithm used, heap configuration and generation wise heap usage are printed.
- .br
- .TP 3
--\-histo[:live]
--Prints a histogram of the heap. For each Java class, number of objects, memory size in bytes, and fully qualified class names are printed. VM internal class names are printed with '*' prefix. If the \f2live\fP suboption is specified, only live objects are counted.
-+\-histo[:live]
-+Prints a histogram of the heap. For each Java class, number of objects, memory size in bytes, and fully qualified class names are printed. VM internal class names are printed with '*' prefix. If the \f2live\fP suboption is specified, only live objects are counted.
- .br
- .TP 3
--\-permstat
--Prints class loader wise statistics of permanent generation of Java heap. For each class loader, its name, liveness, address, parent class loader, and the number and size of classes it has loaded are printed. In addition, the number and size of interned Strings are printed.
-+\-permstat
-+Prints class loader wise statistics of permanent generation of Java heap. For each class loader, its name, liveness, address, parent class loader, and the number and size of classes it has loaded are printed. In addition, the number and size of interned Strings are printed.
- .br
- .TP 3
--\-F
--Force. Use with jmap \-dump or jmap \-histo option if the pid does not respond. The \f2live\fP suboption is not supported in this mode.
-+\-F
-+Force. Use with jmap \-dump or jmap \-histo option if the pid does not respond. The \f2live\fP suboption is not supported in this mode.
- .br
- .TP 3
--\-h
-+\-h
- Prints a help message.
- .br
- .br
- .TP 3
--\-help
-+\-help
- Prints a help message.
- .br
- .br
- .TP 3
--\-J<flag>
--Passes <flag> to the Java virtual machine on which jmap is run.
-+\-J<flag>
-+Passes <flag> to the Java virtual machine on which jmap is run.
- .br
- .RE
-
-@@ -144,17 +144,17 @@
- .RS 3
- .TP 2
- o
--pmap(1)
-+pmap(1)
- .TP 2
- o
--jhat(1)
-+jhat(1)
- .TP 2
- o
--jps(1)
-+jps(1)
- .TP 2
- o
--jsadebugd(1)
-+jsadebugd(1)
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jps.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jps.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jps 1 "10 May 2011"
-+.TH jps 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -41,11 +41,11 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options.
-+options
-+Command\-line options.
- .TP 3
--hostid
--The host identifier of the host for which the process report should be generated. The \f2hostid\fP may include optional components that indicate the communications protocol, port number, and other implementation specific data.
-+hostid
-+The host identifier of the host for which the process report should be generated. The \f2hostid\fP may include optional components that indicate the communications protocol, port number, and other implementation specific data.
- .RE
-
- .LP
-@@ -76,27 +76,27 @@
- .LP
- .RS 3
- .TP 3
--\-q
--Suppress the output of the class name, JAR file name, and arguments passed to the \f2main\fP method, producing only a list of local VM identifiers.
-+\-q
-+Suppress the output of the class name, JAR file name, and arguments passed to the \f2main\fP method, producing only a list of local VM identifiers.
- .TP 3
--\-m
--Output the arguments passed to the main method. The output may be null for embedded JVMs.
-+\-m
-+Output the arguments passed to the main method. The output may be null for embedded JVMs.
- .TP 3
--\-l
--Output the full package name for the application's main class or the full path name to the application's JAR file.
-+\-l
-+Output the full package name for the application's main class or the full path name to the application's JAR file.
- .TP 3
--\-v
--Output the arguments passed to the JVM.
-+\-v
-+Output the arguments passed to the JVM.
- .TP 3
--\-V
--Output the arguments passed to the JVM through the flags file (the .hotspotrc file or the file specified by the \-XX:Flags=<\f2filename\fP> argument).
-+\-V
-+Output the arguments passed to the JVM through the flags file (the .hotspotrc file or the file specified by the \-XX:Flags=<\f2filename\fP> argument).
- .TP 3
--\-Joption
--Pass \f2option\fP to the \f3java\fP launcher called by \f3jps\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
-+\-Joption
-+Pass \f2option\fP to the \f3java\fP launcher called by \f3jps\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
- .RE
-
- .LP
--.SS
-+.SS
- HOST IDENTIFIER
- .LP
- .LP
-@@ -115,17 +115,17 @@
- .LP
- .RS 3
- .TP 3
--protocol
--The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific, optimized, local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP.
-+protocol
-+The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific, optimized, local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP.
- .TP 3
--hostname
--A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host.
-+hostname
-+A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host.
- .TP 3
--port
--The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used.
-+port
-+The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used.
- .TP 3
--servername
--The treatment of this parameter depends on the implementation. For the optimized, local protocol, this field is ignored. For the \f3rmi\fP protocol, this parameter is a string representing the name of the RMI remote object on the remote host. See the \f3\-n\fP option for the jstatd(1) command.
-+servername
-+The treatment of this parameter depends on the implementation. For the optimized, local protocol, this field is ignored. For the \f3rmi\fP protocol, this parameter is a string representing the name of the RMI remote object on the remote host. See the \f3\-n\fP option for the jstatd(1) command.
- .RE
-
- .LP
-@@ -234,17 +234,17 @@
- .RS 3
- .TP 2
- o
--java(1) \- the Java Application Launcher
-+java(1) \- the Java Application Launcher
- .TP 2
- o
--jstat(1) \- the Java virtual machine Statistics Monitoring Tool
-+jstat(1) \- the Java virtual machine Statistics Monitoring Tool
- .TP 2
- o
--jstatd(1) \- the jstat daemon
-+jstatd(1) \- the jstat daemon
- .TP 2
- o
--rmiregistry(1) \- the Java Remote Object Registry
-+rmiregistry(1) \- the Java Remote Object Registry
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jrunscript.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jrunscript.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jrunscript 1 "10 May 2011"
-+.TH jrunscript 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -39,11 +39,11 @@
- .LP
- .RS 3
- .TP 3
--options
--Options, if used, should follow immediately after the command name.
-+options
-+Options, if used, should follow immediately after the command name.
- .TP 3
--arguments
--Arguments, if used, should follow immediately after options or command name.
-+arguments
-+Arguments, if used, should follow immediately after options or command name.
- .RE
-
- .LP
-@@ -59,41 +59,41 @@
- .LP
- .RS 3
- .TP 3
--\-classpath path
--Specify where to find the user's .class files that are accessed by the script.
-+\-classpath path
-+Specify where to find the user's .class files that are accessed by the script.
- .TP 3
--\-cp path
--This is a synonym for \-classpath \f2path\fP
-+\-cp path
-+This is a synonym for \-classpath \f2path\fP
- .TP 3
--\-Dname=value
--Set a Java system property.
-+\-Dname=value
-+Set a Java system property.
- .TP 3
--\-J<flag>
--Pass <flag> directly to the Java virtual machine on which jrunscript is run.
-+\-J<flag>
-+Pass <flag> directly to the Java virtual machine on which jrunscript is run.
- .TP 3
--\-l language
--Use the specified scripting language. By default, JavaScript is used. Note that to use other scripting languages, you also need to specify the corresponding script engine's jar file using \-cp or \-classpath option.
-+\-l language
-+Use the specified scripting language. By default, JavaScript is used. Note that to use other scripting languages, you also need to specify the corresponding script engine's jar file using \-cp or \-classpath option.
- .TP 3
--\-e script
--Evaluate the given script. This option can be used to run "one liner" scripts specified completely on the command line.
-+\-e script
-+Evaluate the given script. This option can be used to run "one liner" scripts specified completely on the command line.
- .TP 3
--\-encoding encoding
--Specify the character encoding used while reading script files.
-+\-encoding encoding
-+Specify the character encoding used while reading script files.
- .TP 3
--\-f script\-file
--Evaluate the given script file (batch mode).
-+\-f script\-file
-+Evaluate the given script file (batch mode).
- .TP 3
--\-f \-
--Read and evaluate a script from standard input (interactive mode).
-+\-f \-
-+Read and evaluate a script from standard input (interactive mode).
- .TP 3
--\-help\
--Output help message and exit.
-+\-help\
-+Output help message and exit.
- .TP 3
--\-?\
--Output help message and exit.
-+\-?\
-+Output help message and exit.
- .TP 3
--\-q\
--List all script engines available and exit.
-+\-q\
-+List all script engines available and exit.
- .RE
-
- .LP
-@@ -104,7 +104,7 @@
- .LP
- .SH "EXAMPLES"
- .LP
--.SS
-+.SS
- Executing inline scripts
- .LP
- .nf
-@@ -118,7 +118,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Use specified language and evaluate given script file
- .LP
- .nf
-@@ -130,7 +130,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Interactive mode
- .LP
- .nf
-@@ -162,7 +162,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Run script file with script arguments
- .LP
- .nf
-@@ -174,14 +174,14 @@
- .fi
-
- .LP
--test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array.
-+test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array.
- .SH "SEE ALSO"
- .LP
- .LP
--If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in
-+If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in
- .na
- \f2jsdocs\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
-+http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
- .LP
--
-+
---- jdk/src/bsd/doc/man/jsadebugd.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jsadebugd.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jsadebugd 1 "10 May 2011"
-+.TH jsadebugd 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -41,28 +41,28 @@
- .LP
- .RS 3
- .TP 3
--pid
--process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process.
-+pid
-+process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process.
- .TP 3
--executable
--Java executable from which the core dump was produced
-+executable
-+Java executable from which the core dump was produced
- .TP 3
--core
--Core file to which the debug server should attach.
-+core
-+Core file to which the debug server should attach.
- .TP 3
--server\-id
--Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique.
-+server\-id
-+Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique.
- .RE
-
- .LP
- .SH "DESCRIPTION"
- .LP
- .LP
--\f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP,
-+\f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP,
- .na
- \f2rmiregistry\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
- .LP
- .nf
- \f3
-@@ -87,23 +87,23 @@
- .RS 3
- .TP 2
- o
--jinfo(1)
-+jinfo(1)
- .TP 2
- o
--jmap(1)
-+jmap(1)
- .TP 2
- o
--jps(1)
-+jps(1)
- .TP 2
- o
--jstack(1)
-+jstack(1)
- .TP 2
- o
- .na
- \f2rmiregistry\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jstack.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jstack.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jstack 1 "10 May 2011"
-+.TH jstack 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -48,27 +48,27 @@
- .LP
- .RS 3
- .TP 3
--pid
--process id for which the stack trace is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
-+pid
-+process id for which the stack trace is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
- .RE
-
- .LP
- .RS 3
- .TP 3
--executable
--Java executable from which the core dump was produced.
-+executable
-+Java executable from which the core dump was produced.
- .br
- .TP 3
--core
--core file for which the stack trace is to be printed.
-+core
-+core file for which the stack trace is to be printed.
- .br
- .TP 3
--remote\-hostname\-or\-IP
--remote debug server's (see jsadebugd(1)) hostname or IP address.
-+remote\-hostname\-or\-IP
-+remote debug server's (see jsadebugd(1)) hostname or IP address.
- .br
- .TP 3
--server\-id
--optional unique id, if multiple debug servers are running on the same remote host.
-+server\-id
-+optional unique id, if multiple debug servers are running on the same remote host.
- .RE
-
- .LP
-@@ -98,25 +98,25 @@
- .LP
- .RS 3
- .TP 3
--\-F
--Force a stack dump when 'jstack [\-l] pid' does not respond.
-+\-F
-+Force a stack dump when 'jstack [\-l] pid' does not respond.
- .TP 3
--\-l
--Long listing. Prints additional information about locks such as list of owned java.util.concurrent
-+\-l
-+Long listing. Prints additional information about locks such as list of owned java.util.concurrent
- .na
- \f2ownable synchronizers\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
-+http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html.
- .TP 3
--\-m
--prints mixed mode (both Java and native C/C++ frames) stack trace.
-+\-m
-+prints mixed mode (both Java and native C/C++ frames) stack trace.
- .TP 3
--\-h
-+\-h
- prints a help message.
- .br
- .br
- .TP 3
--\-help
-+\-help
- prints a help message
- .br
- .RE
-@@ -127,16 +127,16 @@
- .RS 3
- .TP 2
- o
--pstack(1)
-+pstack(1)
- .TP 2
- o
--c++filt(1)
-+c++filt(1)
- .TP 2
- o
--jps(1)
-+jps(1)
- .TP 2
- o
--jsadebugd(1)
-+jsadebugd(1)
- .RE
-
- .LP
-@@ -145,4 +145,4 @@
- .LP
- Mixed mode stack trace, the \-m option, does not work with the remote debug server.
- .LP
--
-+
---- jdk/src/bsd/doc/man/jstat.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jstat.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jstat 1 "10 May 2011"
-+.TH jstat 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -39,27 +39,27 @@
- .LP
- .RS 3
- .TP 3
--generalOption
--A single general command\-line option (\-help, \-options, or \-version)
-+generalOption
-+A single general command\-line option (\-help, \-options, or \-version)
- .TP 3
--outputOptions
--One or more output options, consisting of a single \f2statOption\fP, plus any of the \-t, \-h, and \-J options.
-+outputOptions
-+One or more output options, consisting of a single \f2statOption\fP, plus any of the \-t, \-h, and \-J options.
- .TP 3
--vmid
--Virtual machine identifier, a string indicating the target Java virtual machine (JVM). The general syntax is
-+vmid
-+Virtual machine identifier, a string indicating the target Java virtual machine (JVM). The general syntax is
- .nf
- \f3
- .fl
- [\fP\f4protocol\fP\f3:][//]\fP\f4lvmid\fP[@\f2hostname\fP[:\f2port\fP]/\f2servername\fP]
- .fl
- .fi
--The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details.
-+The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details.
- .TP 3
--interval[s|ms]
--Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval.
-+interval[s|ms]
-+Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval.
- .TP 3
--count
--Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer.
-+count
-+Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer.
- .RE
-
- .LP
-@@ -73,7 +73,7 @@
- .br
-
- .LP
--.SS
-+.SS
- VIRTUAL MACHINE IDENTIFIER
- .LP
- .LP
-@@ -89,20 +89,20 @@
- .LP
- .RS 3
- .TP 3
--protocol
--The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific optimized local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP.
-+protocol
-+The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific optimized local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP.
- .TP 3
--lvmid
--The local virtual machine identifier for the target JVM. The \f2lvmid\fP is a platform\-specific value that uniquely identifies a JVM on a system. The \f2lvmid\fP is the only required component of a virtual machine identifier. The \f2lvmid\fP is typically, but not necessarily, the operating system's process identifier for the target JVM process. You can use the jps(1) command to determine the \f2lvmid\fP. Also, you can determine \f2lvmid\fP on Unix platforms with the \f3ps\fP command, and on Windows with the Windows Task Manager.
-+lvmid
-+The local virtual machine identifier for the target JVM. The \f2lvmid\fP is a platform\-specific value that uniquely identifies a JVM on a system. The \f2lvmid\fP is the only required component of a virtual machine identifier. The \f2lvmid\fP is typically, but not necessarily, the operating system's process identifier for the target JVM process. You can use the jps(1) command to determine the \f2lvmid\fP. Also, you can determine \f2lvmid\fP on Unix platforms with the \f3ps\fP command, and on Windows with the Windows Task Manager.
- .TP 3
--hostname
--A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host.
-+hostname
-+A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host.
- .TP 3
--port
--The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol, the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used.
-+port
-+The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol, the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used.
- .TP 3
--servername
--The treatment of this parameter depends on implementation. For the optimized local protocol, this field is ignored. For the \f3rmi\fP protocol, it represents the name of the RMI remote object on the remote host.
-+servername
-+The treatment of this parameter depends on implementation. For the optimized local protocol, this field is ignored. For the \f3rmi\fP protocol, it represents the name of the RMI remote object on the remote host.
- .RE
-
- .LP
-@@ -116,7 +116,7 @@
- .LP
- \f3NOTE\fP: All options, and their functionality are subject to change or removal in future releases.
- .LP
--.SS
-+.SS
- GENERAL OPTIONS
- .LP
- .LP
-@@ -124,18 +124,18 @@
- .LP
- .RS 3
- .TP 3
--\-help
--Display help message.
-+\-help
-+Display help message.
- .TP 3
--\-version
--Display version information.
-+\-version
-+Display version information.
- .TP 3
--\-options
--Display list of statistics options. See the Output Options section below.
-+\-options
-+Display list of statistics options. See the Output Options section below.
- .RE
-
- .LP
--.SS
-+.SS
- OUTPUT OPTIONS
- .LP
- .LP
-@@ -155,11 +155,12 @@
- .LP
- .RS 3
- .TP 3
--\-statOption
-+\-statOption
- Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation.
- .br
- .br
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -455,13 +456,13 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Displays...\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'class\h'|\n(41u'
-@@ -477,7 +478,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'compiler\h'|\n(41u'
-@@ -493,7 +494,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gc\h'|\n(41u'
-@@ -509,7 +510,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gccapacity\h'|\n(41u'
-@@ -525,7 +526,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gccause\h'|\n(41u'
-@@ -541,7 +542,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcnew\h'|\n(41u'
-@@ -557,7 +558,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcnewcapacity\h'|\n(41u'
-@@ -573,7 +574,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcold\h'|\n(41u'
-@@ -589,7 +590,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcoldcapacity\h'|\n(41u'
-@@ -605,7 +606,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcpermcapacity\h'|\n(41u'
-@@ -621,7 +622,7 @@
- .sp |\n(31u
- .ne \n(k|u+\n(.Vu
- .if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'gcutil\h'|\n(41u'
-@@ -637,7 +638,7 @@
- .sp |\n(31u
- .ne \n(l|u+\n(.Vu
- .if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'printcompilation\h'|\n(41u'
-@@ -667,20 +668,21 @@
- .rm j+
- .rm k+
- .rm l+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-52
- .TP 3
--\-h n
--Display a column header every \f2n\fP samples (output rows), where \f2n\fP is a positive integer. Default value is 0, which displays the column header above the first row of data.
-+\-h n
-+Display a column header every \f2n\fP samples (output rows), where \f2n\fP is a positive integer. Default value is 0, which displays the column header above the first row of data.
- .TP 3
--\-t n
--Display a timestamp column as the first column of output. The timestamp is the time since the start time of the target JVM.
-+\-t n
-+Display a timestamp column as the first column of output. The timestamp is the time since the start time of the target JVM.
- .TP 3
--\-JjavaOption
--Pass \f2javaOption\fP to the \f3java\fP application launcher. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. For a complete list of options, see java(1)
-+\-JjavaOption
-+Pass \f2javaOption\fP to the \f3java\fP application launcher. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. For a complete list of options, see java(1)
- .RE
-
- .LP
--.SS
-+.SS
- STATOPTIONS AND OUTPUT
- .LP
- .LP
-@@ -688,10 +690,11 @@
- .br
-
- .LP
--.SS
-+.SS
- \-class Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -817,25 +820,25 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Class Loader Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Loaded\h'|\n(41u'Number of classes loaded.
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Bytes\h'|\n(41u'Number of Kbytes loaded.
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Unloaded\h'|\n(41u'
-@@ -851,7 +854,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Bytes\h'|\n(41u'
-@@ -867,7 +870,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Time\h'|\n(41u'
-@@ -888,13 +891,15 @@
- .rm a+
- .rm b+
- .rm c+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-21
-
- .LP
--.SS
-+.SS
- \-compiler Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -1072,17 +1077,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'HotSpot Just\-In\-Time Compiler Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Compiled\h'|\n(41u'
-@@ -1098,7 +1103,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Failed\h'|\n(41u'
-@@ -1114,7 +1119,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Invalid\h'|\n(41u'
-@@ -1130,7 +1135,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Time\h'|\n(41u'
-@@ -1146,7 +1151,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FailedType\h'|\n(41u'
-@@ -1162,7 +1167,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FailedMethod\h'|\n(41u'
-@@ -1186,13 +1191,15 @@
- .rm d+
- .rm e+
- .rm f+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-29
-
- .LP
--.SS
-+.SS
- \-gc Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -1534,17 +1541,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Garbage\-collected heap statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0C\h'|\n(41u'
-@@ -1560,7 +1567,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1C\h'|\n(41u'
-@@ -1576,7 +1583,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0U\h'|\n(41u'
-@@ -1592,7 +1599,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1U\h'|\n(41u'
-@@ -1608,7 +1615,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EC\h'|\n(41u'
-@@ -1624,7 +1631,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EU\h'|\n(41u'
-@@ -1640,7 +1647,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OC\h'|\n(41u'
-@@ -1656,7 +1663,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OU\h'|\n(41u'
-@@ -1672,7 +1679,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PC\h'|\n(41u'
-@@ -1688,7 +1695,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PU\h'|\n(41u'
-@@ -1704,7 +1711,7 @@
- .sp |\n(31u
- .ne \n(k|u+\n(.Vu
- .if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -1720,7 +1727,7 @@
- .sp |\n(31u
- .ne \n(l|u+\n(.Vu
- .if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGCT\h'|\n(41u'
-@@ -1734,13 +1741,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of full GC events.
- .ne \n(m|u+\n(.Vu
- .if (\n(m|+\n(#^-1v)>\n(#- .nr #- +(\n(m|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGCT\h'|\n(41u'
-@@ -1756,7 +1763,7 @@
- .sp |\n(31u
- .ne \n(n|u+\n(.Vu
- .if (\n(n|+\n(#^-1v)>\n(#- .nr #- +(\n(n|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCT\h'|\n(41u'
-@@ -1788,13 +1795,15 @@
- .rm l+
- .rm m+
- .rm n+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-63
-
- .LP
--.SS
-+.SS
- \-gccapacity Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -2156,17 +2165,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Memory Pool Generation and Space Capacities\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGCMN\h'|\n(41u'
-@@ -2182,7 +2191,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGCMX\h'|\n(41u'
-@@ -2198,7 +2207,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGC\h'|\n(41u'
-@@ -2214,7 +2223,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0C\h'|\n(41u'
-@@ -2230,7 +2239,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1C\h'|\n(41u'
-@@ -2246,7 +2255,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EC\h'|\n(41u'
-@@ -2262,7 +2271,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGCMN\h'|\n(41u'
-@@ -2278,7 +2287,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGCMX\h'|\n(41u'
-@@ -2294,7 +2303,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGC\h'|\n(41u'
-@@ -2310,7 +2319,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OC\h'|\n(41u'
-@@ -2326,7 +2335,7 @@
- .sp |\n(31u
- .ne \n(k|u+\n(.Vu
- .if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGCMN\h'|\n(41u'
-@@ -2342,7 +2351,7 @@
- .sp |\n(31u
- .ne \n(l|u+\n(.Vu
- .if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGCMX\h'|\n(41u'
-@@ -2358,7 +2367,7 @@
- .sp |\n(31u
- .ne \n(m|u+\n(.Vu
- .if (\n(m|+\n(#^-1v)>\n(#- .nr #- +(\n(m|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGC\h'|\n(41u'
-@@ -2374,7 +2383,7 @@
- .sp |\n(31u
- .ne \n(n|u+\n(.Vu
- .if (\n(n|+\n(#^-1v)>\n(#- .nr #- +(\n(n|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PC\h'|\n(41u'
-@@ -2390,7 +2399,7 @@
- .sp |\n(31u
- .ne \n(o|u+\n(.Vu
- .if (\n(o|+\n(#^-1v)>\n(#- .nr #- +(\n(o|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -2404,7 +2413,7 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of Full GC Events.
-@@ -2427,16 +2436,18 @@
- .rm m+
- .rm n+
- .rm o+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-67
-
- .LP
--.SS
-+.SS
- \-gccause Option
- .LP
- .LP
- This option displays the same summary of garbage collection statistics as the \f3\-gcutil\fP option, but includes the causes of the last garbage collection event and (if applicable) the current garbage collection event. In addition to the columns listed for \f3\-gcutil\fP, this option adds the following columns:
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -2534,17 +2545,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Garbage Collection Statistics, Including GC Events\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'LGCC\h'|\n(41u'
-@@ -2560,7 +2571,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCC\h'|\n(41u'
-@@ -2580,13 +2591,15 @@
- .35
- .rm a+
- .rm b+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-13
-
- .LP
--.SS
-+.SS
- \-gcnew Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -2848,17 +2861,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'New Generation Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0C\h'|\n(41u'
-@@ -2874,7 +2887,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1C\h'|\n(41u'
-@@ -2890,7 +2903,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0U\h'|\n(41u'
-@@ -2906,7 +2919,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1U\h'|\n(41u'
-@@ -2920,13 +2933,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'TT\h'|\n(41u'Tenuring threshold.
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'MTT\h'|\n(41u'
-@@ -2942,7 +2955,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'DSS\h'|\n(41u'
-@@ -2958,7 +2971,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EC\h'|\n(41u'
-@@ -2974,7 +2987,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EU\h'|\n(41u'
-@@ -2990,7 +3003,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -3006,7 +3019,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGCT\h'|\n(41u'
-@@ -3034,13 +3047,15 @@
- .rm h+
- .rm i+
- .rm j+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-47
-
- .LP
--.SS
-+.SS
- \-gcnewcapacity Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -3302,17 +3317,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'New Generation Space Size Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGCMN\h'|\n(41u'
-@@ -3328,7 +3343,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGCMX\h'|\n(41u'
-@@ -3344,7 +3359,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'NGC\h'|\n(41u'
-@@ -3360,7 +3375,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0CMX\h'|\n(41u'
-@@ -3376,7 +3391,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0C\h'|\n(41u'
-@@ -3392,7 +3407,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1CMX\h'|\n(41u'
-@@ -3408,7 +3423,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1C\h'|\n(41u'
-@@ -3424,7 +3439,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'ECMX\h'|\n(41u'
-@@ -3440,7 +3455,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EC\h'|\n(41u'
-@@ -3456,7 +3471,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -3470,7 +3485,7 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of Full GC Events.
-@@ -3488,13 +3503,15 @@
- .rm h+
- .rm i+
- .rm j+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-47
-
- .LP
--.SS
-+.SS
- \-gcold Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -3696,17 +3713,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Old and Permanent Generation Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PC\h'|\n(41u'
-@@ -3722,7 +3739,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PU\h'|\n(41u'
-@@ -3738,7 +3755,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OC\h'|\n(41u'
-@@ -3754,7 +3771,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OU\h'|\n(41u'
-@@ -3770,7 +3787,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -3784,13 +3801,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of full GC events.
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGCT\h'|\n(41u'
-@@ -3806,7 +3823,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCT\h'|\n(41u'
-@@ -3831,13 +3848,15 @@
- .rm e+
- .rm f+
- .rm g+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
-
- .LP
--.SS
-+.SS
- \-gcoldcapacity Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -4039,17 +4058,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Old Generation Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGCMN\h'|\n(41u'
-@@ -4065,7 +4084,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGCMX\h'|\n(41u'
-@@ -4081,7 +4100,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OGC\h'|\n(41u'
-@@ -4097,7 +4116,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'OC\h'|\n(41u'
-@@ -4113,7 +4132,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -4127,13 +4146,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of full GC events.
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGCT\h'|\n(41u'
-@@ -4149,7 +4168,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCT\h'|\n(41u'
-@@ -4174,13 +4193,15 @@
- .rm e+
- .rm f+
- .rm g+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
-
- .LP
--.SS
-+.SS
- \-gcpermcapacity Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -4382,17 +4403,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Permanent Generation Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGCMN\h'|\n(41u'
-@@ -4408,7 +4429,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGCMX\h'|\n(41u'
-@@ -4424,7 +4445,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PGC\h'|\n(41u'
-@@ -4440,7 +4461,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'PC\h'|\n(41u'
-@@ -4456,7 +4477,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -4470,13 +4491,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of full GC events.
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGCT\h'|\n(41u'
-@@ -4492,7 +4513,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCT\h'|\n(41u'
-@@ -4517,13 +4538,15 @@
- .rm e+
- .rm f+
- .rm g+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
-
- .LP
--.SS
-+.SS
- \-gcutil Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -4765,17 +4788,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Summary of Garbage Collection Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S0\h'|\n(41u'
-@@ -4791,7 +4814,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'S1\h'|\n(41u'
-@@ -4807,7 +4830,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'E\h'|\n(41u'
-@@ -4823,7 +4846,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'O\h'|\n(41u'
-@@ -4839,7 +4862,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'P\h'|\n(41u'
-@@ -4855,7 +4878,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGC\h'|\n(41u'
-@@ -4871,7 +4894,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'YGCT\h'|\n(41u'
-@@ -4885,13 +4908,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGC\h'|\n(41u'Number of full GC events.
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'FGCT\h'|\n(41u'
-@@ -4907,7 +4930,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'GCT\h'|\n(41u'
-@@ -4934,13 +4957,15 @@
- .rm g+
- .rm h+
- .rm i+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-43
-
- .LP
--.SS
-+.SS
- \-printcompilation Option
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -5062,17 +5087,17 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'HotSpot Compiler Method Statistics\h'|\n(41u'
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Column\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Compiled\h'|\n(41u'
-@@ -5088,7 +5113,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Size\h'|\n(41u'
-@@ -5102,13 +5127,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Type\h'|\n(41u'Compilation type.
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'Method\h'|\n(41u'
-@@ -5129,6 +5154,7 @@
- .rm a+
- .rm b+
- .rm c+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-19
-
- .LP
-@@ -5137,7 +5163,7 @@
- .LP
- This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891.
- .LP
--.SS
-+.SS
- Using the gcutil option
- .LP
- .LP
-@@ -5188,7 +5214,7 @@
- .LP
- The output of this example shows that a young generation collection occurred between the 3rd and 4th sample. The collection took 0.001 seconds and promoted objects from the eden space (E) to the old space (O), resulting in an increase of old space utilization from 9.49% to 9.51%. Before the collection, the survivor space was 12.44% utilized, but after this collection it is only 7.74% utilized.
- .LP
--.SS
-+.SS
- Repeating the column header string
- .LP
- .LP
-@@ -5250,7 +5276,7 @@
- .LP
- Another collection occurs between the 5th and 6th samples. This collection found very few survivors and returned the tenuring threshold to 31.
- .LP
--.SS
-+.SS
- Including a time stamp for each sample
- .LP
- .LP
-@@ -5285,7 +5311,7 @@
- .LP
- The \f2Timestamp\fP column reports the elapsed time in seconds since the start of the target JVM. In addition, the \f3\-gcoldcapacity\fP output shows the old generation capacity (OGC) and the old space capacity (OC) increasing as the heap expands to meet allocation and/or promotion demands. The old generation capacity (OGC) has grown to from 11696 KB to 13820 KB after the 81st Full GC (FGC). The maximum capacity of the generation (and space) is 60544 KB (OGCMX), so it still has room to expand.
- .LP
--.SS
-+.SS
- Monitor instrumentation for a remote JVM
- .LP
- .LP
-@@ -5313,17 +5339,17 @@
- .RS 3
- .TP 2
- o
--java(1) \- the Java Application Launcher
-+java(1) \- the Java Application Launcher
- .TP 2
- o
--jps(1) \- the Java Process Status Application
-+jps(1) \- the Java Process Status Application
- .TP 2
- o
--jstatd(1) \- the jvmstat daemon
-+jstatd(1) \- the jvmstat daemon
- .TP 2
- o
--rmiregistry(1) \- the Java Remote Object Registry
-+rmiregistry(1) \- the Java Remote Object Registry
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/jstatd.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/jstatd.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH jstatd 1 "10 May 2011"
-+.TH jstatd 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -42,8 +42,8 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options. The options may be in any order. If there are redundant or contradictory options, the last option specified will take precedence.
-+options
-+Command\-line options. The options may be in any order. If there are redundant or contradictory options, the last option specified will take precedence.
- .RE
-
- .LP
-@@ -65,17 +65,17 @@
- .LP
- .RS 3
- .TP 3
--\-nr
--Do not attempt to create an internal RMI registry within the \f2jstatd\fP process when an existing RMI registry is not found.
-+\-nr
-+Do not attempt to create an internal RMI registry within the \f2jstatd\fP process when an existing RMI registry is not found.
- .TP 3
--\-p\ port
--Port number where the RMI registry is expected to be found, or, if not found, created if \f2\-nr\fP is not specified.
-+\-p\ port
-+Port number where the RMI registry is expected to be found, or, if not found, created if \f2\-nr\fP is not specified.
- .TP 3
--\-n\ rminame
--Name to which the remote RMI object is bound in the RMI registry. The default name is \f2JStatRemoteHost\fP. If multiple \f3jstatd\fP servers are started on the same host, the name of the exported RMI object for each server can be made unique by specifying this option. However, doing so will require that the unique server name be included in the monitoring client's \f2hostid\fP and \f2vmid\fP strings.
-+\-n\ rminame
-+Name to which the remote RMI object is bound in the RMI registry. The default name is \f2JStatRemoteHost\fP. If multiple \f3jstatd\fP servers are started on the same host, the name of the exported RMI object for each server can be made unique by specifying this option. However, doing so will require that the unique server name be included in the monitoring client's \f2hostid\fP and \f2vmid\fP strings.
- .TP 3
--\-Joption
--Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
-+\-Joption
-+Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
- .RE
-
- .LP
-@@ -88,11 +88,11 @@
- The \f3jstatd\fP server does not provide any authentication of remote clients. Therefore, running a \f3jstatd\fP server process exposes the instrumentation export by all JVMs for which the \f3jstatd\fP process has access permissions to any user on the network. This exposure may be undesireable in your environment and local security policies should be considered before starting the \f3jstatd\fP process, particularly in production environments or on unsecure networks.
- .LP
- .LP
--The \f3jstatd\fP server installs an instance of RMISecurityPolicy if no other security manager has been installed and therefore requires a security policy file to be specified. The policy file must conform to the default policy implementation's
-+The \f3jstatd\fP server installs an instance of RMISecurityPolicy if no other security manager has been installed and therefore requires a security policy file to be specified. The policy file must conform to the default policy implementation's
- .na
- \f2Policy File Syntax\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
- .LP
- .LP
- The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server.
-@@ -143,7 +143,7 @@
- .LP
- Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background.
- .LP
--.SS
-+.SS
- Using Internal RMI Registry
- .LP
- .LP
-@@ -158,7 +158,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Using External RMI Registry
- .LP
- .LP
-@@ -203,7 +203,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Inhibiting creation of an in\-process RMI registry
- .LP
- .LP
-@@ -218,7 +218,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Enabling RMI logging capabilities.
- .LP
- .LP
-@@ -238,20 +238,20 @@
- .RS 3
- .TP 2
- o
--java(1) \- the Java Application Launcher
-+java(1) \- the Java Application Launcher
- .TP 2
- o
--jps(1) \- the Java Process Status Application
-+jps(1) \- the Java Process Status Application
- .TP 2
- o
--jstat(1) \- the Java Virtual Machine Statistics Monitoring Tool
-+jstat(1) \- the Java Virtual Machine Statistics Monitoring Tool
- .TP 2
- o
- .na
- \f2rmiregistry\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/keytool.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/keytool.1 2014-01-18 12:16:33.000000000 -0800
-@@ -1,4 +1,4 @@
--." Copyright (c) 1998, 2011, 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 "10 May 2011"
-+.TH keytool 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -43,7 +43,7 @@
- .LP
- .SH "DESCRIPTION"
- .LP
--\f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers.
-+\f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers.
- .LP
- A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it.
- .LP
-@@ -61,22 +61,22 @@
- .RS 3
- .TP 2
- o
--All command and option names are preceded by a minus sign (\-).
-+All command and option names are preceded by a minus sign (\-).
- .TP 2
- o
--The options for each command may be provided in any order.
-+The options for each command may be provided in any order.
- .TP 2
- o
--All items not italicized or in braces or square brackets are required to appear as is.
-+All items not italicized or in braces or square brackets are required to appear as is.
- .TP 2
- o
--Braces surrounding an option generally signify that a default value will be used if the option is not specified on the command line. Braces are also used around the \f2\-v\fP, \f2\-rfc\fP, and \f2\-J\fP options, which only have meaning if they appear on the command line (that is, they don't have any "default" values other than not existing).
-+Braces surrounding an option generally signify that a default value will be used if the option is not specified on the command line. Braces are also used around the \f2\-v\fP, \f2\-rfc\fP, and \f2\-J\fP options, which only have meaning if they appear on the command line (that is, they don't have any "default" values other than not existing).
- .TP 2
- o
--Brackets surrounding an option signify that the user is prompted for the value(s) if the option is not specified on the command line. (For a \f2\-keypass\fP option, if you do not specify the option on the command line, \f3keytool\fP will first attempt to use the keystore password to recover the private/secret key, and if this fails, will then prompt you for the private/secret key password.)
-+Brackets surrounding an option signify that the user is prompted for the value(s) if the option is not specified on the command line. (For a \f2\-keypass\fP option, if you do not specify the option on the command line, \f3keytool\fP will first attempt to use the keystore password to recover the private/secret key, and if this fails, will then prompt you for the private/secret key password.)
- .TP 2
- o
--Items in italics (option values) represent the actual values that must be supplied. For example, here is the format of the \f2\-printcert\fP command:
-+Items in italics (option values) represent the actual values that must be supplied. For example, here is the format of the \f2\-printcert\fP command:
- .nf
- \f3
- .fl
-@@ -85,7 +85,7 @@
- \fP
- .fi
- .LP
--When specifying a \f2\-printcert\fP command, replace \f2cert_file\fP with the actual file name, as in:
-+When specifying a \f2\-printcert\fP command, replace \f2cert_file\fP with the actual file name, as in:
- .nf
- \f3
- .fl
-@@ -95,10 +95,10 @@
- .fi
- .TP 2
- o
--Option values must be quoted if they contain a blank (space).
-+Option values must be quoted if they contain a blank (space).
- .TP 2
- o
--The \f2\-help\fP command is the default. Thus, the command line
-+The \f2\-help\fP command is the default. Thus, the command line
- .nf
- \f3
- .fl
-@@ -107,7 +107,7 @@
- \fP
- .fi
- .LP
--is equivalent to
-+is equivalent to
- .nf
- \f3
- .fl
-@@ -118,7 +118,7 @@
- .RE
-
- .LP
--.SS
-+.SS
- Option Defaults
- .LP
- .LP
-@@ -187,24 +187,24 @@
- .RS 3
- .TP 2
- o
--If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA"
-+If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA"
- .TP 2
- o
--If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA".
-+If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA".
- .TP 2
- o
--If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA".
-+If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA".
- .RE
-
- .LP
- .LP
--Please consult the
-+Please consult the
- .na
- \f2Java Cryptography Architecture API Specification & Reference\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
- .LP
--.SS
-+.SS
- Common Options
- .LP
- .LP
-@@ -218,59 +218,59 @@
- .LP
- .RS 3
- .TP 3
--\-storetype storetype
-+\-storetype storetype
- .LP
--This qualifier specifies the type of keystore to be instantiated.
-+This qualifier specifies the type of keystore to be instantiated.
- .TP 3
--\-keystore keystore
-+\-keystore keystore
- .LP
--The keystore location.
-+The keystore location.
- .LP
--If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created
-+If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created
- .LP
--Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).
-+Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).
- .TP 3
--\-storepass[:env|:file] argument
-+\-storepass[:env|:file] argument
- .LP
--The password which is used to protect the integrity of the keystore.
-+The password which is used to protect the integrity of the keystore.
- .LP
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows:
-+If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows:
- .RS 3
- .TP 2
- o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
-+\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
- .TP 2
- o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
-+\f2file\fP: Retrieve the password from the file named \f2argument\fP
- .RE
- .LP
--\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).)
-+\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).)
- .LP
--The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
-+The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
- .LP
--When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.
-+When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.
- .TP 3
--\-providerName provider_name
-+\-providerName provider_name
- .LP
--Used to identify a cryptographic service provider's name when listed in the security properties file.
-+Used to identify a cryptographic service provider's name when listed in the security properties file.
- .TP 3
--\-providerClass provider_class_name
-+\-providerClass provider_class_name
- .LP
--Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
-+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
- .TP 3
--\-providerArg provider_arg
-+\-providerArg provider_arg
- .LP
--Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
-+Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
- .TP 3
--\-protected
-+\-protected
- .LP
--Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
-+Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
- .LP
--Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.
-+Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.
- .TP 3
--\-ext {name{:critical}{=value}}
-+\-ext {name{:critical}{=value}}
- .LP
--Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.
-+Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.
- .RE
-
- .LP
-@@ -278,6 +278,7 @@
- Currently keytool supports these named extensions (case\-insensitive):
- .LP
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -521,13 +522,13 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Name\fP\h'|\n(41u'\f3Value\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'BC or BasicConstraints\h'|\n(41u'
-@@ -543,7 +544,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'KU or KeyUsage\h'|\n(41u'
-@@ -559,7 +560,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'EKU or ExtendedkeyUsage\h'|\n(41u'
-@@ -577,7 +578,7 @@
- .ne \n(e|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -602,7 +603,7 @@
- .ne \n(g|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -625,7 +626,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'SIA or SubjectInfoAccess\h'|\n(41u'
-@@ -643,7 +644,7 @@
- .ne \n(j|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -678,11 +679,12 @@
- .rm h+
- .rm i+
- .rm j+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-38
-
- .LP
- .LP
--For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then.
-+For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there is no value, the extension has an empty value field then.
- .LP
- .LP
- A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
-@@ -698,24 +700,24 @@
- .LP
- .SH "COMMANDS"
- .LP
--.SS
-+.SS
- Creating or Adding Data to the Keystore
- .LP
- .RS 3
- .TP 3
--\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
-+Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
- .LP
--\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid.
-+\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid.
- .LP
--If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used.
-+If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used.
- .LP
--\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
-+\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
- .LP
--The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain.
-+The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain.
- .LP
--The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP:
-+The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP:
- .nf
- \f3
- .fl
-@@ -730,7 +732,7 @@
- \fP
- .fi
- .LP
--The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued:
-+The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued:
- .nf
- \f3
- .fl
-@@ -741,7 +743,7 @@
- \fP
- .fi
- .LP
--The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain:
-+The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain:
- .nf
- \f3
- .fl
-@@ -750,29 +752,29 @@
- \fP
- .fi
- .TP 3
--\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP.
-+Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP.
- .LP
--\f2keyalg\fP specifies the algorithm to be used to generate the key pair, and \f2keysize\fP specifies the size of each key to be generated. \f2sigalg\fP specifies the algorithm that should be used to sign the self\-signed certificate; this algorithm must be compatible with \f2keyalg\fP.
-+\f2keyalg\fP specifies the algorithm to be used to generate the key pair, and \f2keysize\fP specifies the size of each key to be generated. \f2sigalg\fP specifies the algorithm that should be used to sign the self\-signed certificate; this algorithm must be compatible with \f2keyalg\fP.
- .LP
--\f2dname\fP specifies the X.500 Distinguished Name to be associated with \f2alias\fP, and is used as the \f2issuer\fP and \f2subject\fP fields in the self\-signed certificate. If no distinguished name is provided at the command line, the user will be prompted for one.
-+\f2dname\fP specifies the X.500 Distinguished Name to be associated with \f2alias\fP, and is used as the \f2issuer\fP and \f2subject\fP fields in the self\-signed certificate. If no distinguished name is provided at the command line, the user will be prompted for one.
- .LP
--\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
-+\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
- .LP
--\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field.
-+\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field.
- .LP
--The option value can be set in one of these two forms:
-+The option value can be set in one of these two forms:
- .RS 3
- .TP 3
- 1.
--([+\-]\f2nnn\fP[ymdHMS])+
-+([+\-]\f2nnn\fP[ymdHMS])+
- .TP 3
- 2.
--[yyyy/mm/dd] [HH:MM:SS]
-+[yyyy/mm/dd] [HH:MM:SS]
- .RE
- .LP
--With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
-+With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be:
- .nf
- \f3
- .fl
-@@ -789,197 +791,197 @@
- \fP
- .fi
- .LP
--With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
-+With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
- .LP
--When the option is not provided, the start date is the current time. The option can be provided at most once.
-+When the option is not provided, the start date is the current time. The option can be provided at most once.
- .LP
--\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid.
-+\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid.
- .LP
--This command was named \f2\-genkey\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarity the new name, \f2\-genkeypair\fP, is preferred going forward.
-+This command was named \f2\-genkey\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarity the new name, \f2\-genkeypair\fP, is preferred going forward.
- .TP 3
--\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Generates a secret key and stores it in a new \f2KeyStore.SecretKeyEntry\fP identified by \f2alias\fP.
-+Generates a secret key and stores it in a new \f2KeyStore.SecretKeyEntry\fP identified by \f2alias\fP.
- .LP
--\f2keyalg\fP specifies the algorithm to be used to generate the secret key, and \f2keysize\fP specifies the size of the key to be generated. \f2keypass\fP is a password used to protect the secret key. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
-+\f2keyalg\fP specifies the algorithm to be used to generate the secret key, and \f2keysize\fP specifies the size of the key to be generated. \f2keypass\fP is a password used to protect the secret key. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
- .TP 3
--\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Reads the certificate or certificate chain (where the latter is supplied in a PKCS#7 formatted reply or a sequence of X.509 certificates) from the file \f2cert_file\fP, and stores it in the keystore entry identified by \f2alias\fP. If no file is given, the certificate or certificate chain is read from stdin.
-+Reads the certificate or certificate chain (where the latter is supplied in a PKCS#7 formatted reply or a sequence of X.509 certificates) from the file \f2cert_file\fP, and stores it in the keystore entry identified by \f2alias\fP. If no file is given, the certificate or certificate chain is read from stdin.
- .LP
--\f3keytool\fP can import X.509 v1, v2, and v3 certificates, and PKCS#7 formatted certificate chains consisting of certificates of that type. The data to be imported must be provided either in binary encoding format, or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard. In the latter case, the encoding must be bounded at the beginning by a string that starts with "\-\-\-\-\-BEGIN", and bounded at the end by a string that starts with "\-\-\-\-\-END".
-+\f3keytool\fP can import X.509 v1, v2, and v3 certificates, and PKCS#7 formatted certificate chains consisting of certificates of that type. The data to be imported must be provided either in binary encoding format, or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard. In the latter case, the encoding must be bounded at the beginning by a string that starts with "\-\-\-\-\-BEGIN", and bounded at the end by a string that starts with "\-\-\-\-\-END".
- .LP
--You import a certificate for two reasons:
-+You import a certificate for two reasons:
- .RS 3
- .TP 3
- 1.
--to add it to the list of trusted certificates, or
-+to add it to the list of trusted certificates, or
- .TP 3
- 2.
--to import a certificate reply received from a CA as the result of submitting a Certificate Signing Request (see the \-certreq command) to that CA.
-+to import a certificate reply received from a CA as the result of submitting a Certificate Signing Request (see the \-certreq command) to that CA.
- .RE
- .LP
--Which type of import is intended is indicated by the value of the \f2\-alias\fP option:
-+Which type of import is intended is indicated by the value of the \f2\-alias\fP option:
- .RS 3
- .TP 3
- 1.
--\f3If the alias does not point to a key entry\fP, then \f3keytool\fP assumes you are adding a trusted certificate entry. In this case, the alias should not already exist in the keystore. If the alias does already exist, then \f3keytool\fP outputs an error, since there is already a trusted certificate for that alias, and does not import the certificate.
-+\f3If the alias does not point to a key entry\fP, then \f3keytool\fP assumes you are adding a trusted certificate entry. In this case, the alias should not already exist in the keystore. If the alias does already exist, then \f3keytool\fP outputs an error, since there is already a trusted certificate for that alias, and does not import the certificate.
- .TP 3
- 2.
--\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply.
-+\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply.
- .RE
--\f3Importing a New Trusted Certificate\fP
-+\f3Importing a New Trusted Certificate\fP
- .LP
--Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
-+Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
- .LP
--If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
-+If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
- .LP
--If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
--\f3Importing a Certificate Reply\fP
-+If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
-+\f3Importing a Certificate Reply\fP
- .LP
--When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
-+When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
- .LP
--The methods of determining whether the certificate reply is trusted are described in the following:
-+The methods of determining whether the certificate reply is trusted are described in the following:
- .RS 3
- .TP 2
- o
--\f3If the reply is a single X.509 certificate\fP, \f3keytool\fP attempts to establish a trust chain, starting at the certificate reply and ending at a self\-signed certificate (belonging to a root CA). The certificate reply and the hierarchy of certificates used to authenticate the certificate reply form the new certificate chain of \f2alias\fP. If a trust chain cannot be established, the certificate reply is not imported. In this case, \f3keytool\fP does not print out the certificate and prompt the user to verify it, because it is very hard (if not impossible) for a user to determine the authenticity of the certificate reply.
-+\f3If the reply is a single X.509 certificate\fP, \f3keytool\fP attempts to establish a trust chain, starting at the certificate reply and ending at a self\-signed certificate (belonging to a root CA). The certificate reply and the hierarchy of certificates used to authenticate the certificate reply form the new certificate chain of \f2alias\fP. If a trust chain cannot be established, the certificate reply is not imported. In this case, \f3keytool\fP does not print out the certificate and prompt the user to verify it, because it is very hard (if not impossible) for a user to determine the authenticity of the certificate reply.
- .TP 2
- o
--\f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it.
-+\f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it.
- .RE
- .LP
--If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
-+If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
- .LP
--This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.
-+This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.
- .TP 3
--\-importkeystore \-srckeystore srckeystore \-destkeystore destkeystore {\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] [\-destkeypass destkeypass] } {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-importkeystore \-srckeystore srckeystore \-destkeystore destkeystore {\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] [\-destkeypass destkeypass] } {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Imports a single entry or all entries from a source keystore to a destination keystore.
-+Imports a single entry or all entries from a source keystore to a destination keystore.
- .LP
--When the \f2srcalias\fP option is provided, the command imports the single entry identified by the alias to the destination keystore. If a destination alias is not provided with \f2destalias\fP, then \f2srcalias\fP is used as the destination alias. If the source entry is protected by a password, \f2srckeypass\fP will be used to recover the entry. If \f2srckeypass\fP is not provided, then \f3keytool\fP will attempt to use \f2srcstorepass\fP to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. The destination entry will be protected using \f2destkeypass\fP. If \f2destkeypass\fP is not provided, the destination entry will be protected with the source entry password.
-+When the \f2srcalias\fP option is provided, the command imports the single entry identified by the alias to the destination keystore. If a destination alias is not provided with \f2destalias\fP, then \f2srcalias\fP is used as the destination alias. If the source entry is protected by a password, \f2srckeypass\fP will be used to recover the entry. If \f2srckeypass\fP is not provided, then \f3keytool\fP will attempt to use \f2srcstorepass\fP to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. The destination entry will be protected using \f2destkeypass\fP. If \f2destkeypass\fP is not provided, the destination entry will be protected with the source entry password.
- .LP
--If the \f2srcalias\fP option is not provided, then all entries in the source keystore are imported into the destination keystore. Each destination entry will be stored under the alias from the source entry. If the source entry is protected by a password, \f2srcstorepass\fP will be used to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. If a source keystore entry type is not supported in the destination keystore, or if an error occurs while storing an entry into the destination keystore, the user will be prompted whether to skip the entry and continue, or to quit. The destination entry will be protected with the source entry password.
-+If the \f2srcalias\fP option is not provided, then all entries in the source keystore are imported into the destination keystore. Each destination entry will be stored under the alias from the source entry. If the source entry is protected by a password, \f2srcstorepass\fP will be used to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. If a source keystore entry type is not supported in the destination keystore, or if an error occurs while storing an entry into the destination keystore, the user will be prompted whether to skip the entry and continue, or to quit. The destination entry will be protected with the source entry password.
- .LP
--If the destination alias already exists in the destination keystore, the user is prompted to either overwrite the entry, or to create a new entry under a different alias name.
-+If the destination alias already exists in the destination keystore, the user is prompted to either overwrite the entry, or to create a new entry under a different alias name.
- .LP
--Note that if \f2\-noprompt\fP is provided, the user will not be prompted for a new destination alias. Existing entries will automatically be overwritten with the destination alias name. Finally, entries that can not be imported are automatically skipped and a warning is output.
-+Note that if \f2\-noprompt\fP is provided, the user will not be prompted for a new destination alias. Existing entries will automatically be overwritten with the destination alias name. Finally, entries that can not be imported are automatically skipped and a warning is output.
- .TP 3
--\-printcertreq {\-file file}
-+\-printcertreq {\-file file}
- .LP
--Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input.
-+Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input.
- .RE
-
- .LP
--.SS
-+.SS
- Exporting Data
- .LP
- .RS 3
- .TP 3
--\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Generates a Certificate Signing Request (CSR), using the PKCS#10 format.
-+Generates a Certificate Signing Request (CSR), using the PKCS#10 format.
- .LP
--A CSR is intended to be sent to a certificate authority (CA). The CA will authenticate the certificate requestor (usually off\-line) and will return a certificate or certificate chain, used to replace the existing certificate chain (which initially consists of a self\-signed certificate) in the keystore.
-+A CSR is intended to be sent to a certificate authority (CA). The CA will authenticate the certificate requestor (usually off\-line) and will return a certificate or certificate chain, used to replace the existing certificate chain (which initially consists of a self\-signed certificate) in the keystore.
- .LP
--The private key associated with \f2alias\fP is used to create the PKCS#10 certificate request. In order to access the private key, the appropriate password must be provided, since private keys are protected in the keystore with a password. If \f2keypass\fP is not provided at the command line, and is different from the password used to protect the integrity of the keystore, the user is prompted for it. If dname is provided, it's used as the subject in the CSR. Otherwise, the X.500 Distinguished Name associated with alias is used.
-+The private key associated with \f2alias\fP is used to create the PKCS#10 certificate request. In order to access the private key, the appropriate password must be provided, since private keys are protected in the keystore with a password. If \f2keypass\fP is not provided at the command line, and is different from the password used to protect the integrity of the keystore, the user is prompted for it. If dname is provided, it's used as the subject in the CSR. Otherwise, the X.500 Distinguished Name associated with alias is used.
- .LP
--\f2sigalg\fP specifies the algorithm that should be used to sign the CSR.
-+\f2sigalg\fP specifies the algorithm that should be used to sign the CSR.
- .LP
--The CSR is stored in the file \f2certreq_file\fP. If no file is given, the CSR is output to stdout.
-+The CSR is stored in the file \f2certreq_file\fP. If no file is given, the CSR is output to stdout.
- .LP
--Use the \f2importcert\fP command to import the response from the CA.
-+Use the \f2importcert\fP command to import the response from the CA.
- .TP 3
--\-exportcert {\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption}
-+\-exportcert {\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Reads (from the keystore) the certificate associated with \f2alias\fP, and stores it in the file \f2cert_file\fP.
-+Reads (from the keystore) the certificate associated with \f2alias\fP, and stores it in the file \f2cert_file\fP.
- .LP
--If no file is given, the certificate is output to stdout.
-+If no file is given, the certificate is output to stdout.
- .LP
--The certificate is by default output in binary encoding, but will instead be output in the printable encoding format, as defined by the Internet RFC 1421 standard, if the \f2\-rfc\fP option is specified.
-+The certificate is by default output in binary encoding, but will instead be output in the printable encoding format, as defined by the Internet RFC 1421 standard, if the \f2\-rfc\fP option is specified.
- .LP
--If \f2alias\fP refers to a trusted certificate, that certificate is output. Otherwise, \f2alias\fP refers to a key entry with an associated certificate chain. In that case, the first certificate in the chain is returned. This certificate authenticates the public key of the entity addressed by \f2alias\fP.
-+If \f2alias\fP refers to a trusted certificate, that certificate is output. Otherwise, \f2alias\fP refers to a key entry with an associated certificate chain. In that case, the first certificate in the chain is returned. This certificate authenticates the public key of the entity addressed by \f2alias\fP.
- .LP
--This command was named \f2\-export\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-exportcert\fP, is preferred going forward.
-+This command was named \f2\-export\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-exportcert\fP, is preferred going forward.
- .RE
-
- .LP
--.SS
-+.SS
- Displaying Data
- .LP
- .RS 3
- .TP 3
--\-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}
-+\-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}
- .LP
--Prints (to stdout) the contents of the keystore entry identified by \f2alias\fP. If no alias is specified, the contents of the entire keystore are printed.
-+Prints (to stdout) the contents of the keystore entry identified by \f2alias\fP. If no alias is specified, the contents of the entire keystore are printed.
- .LP
--This command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, with additional information such as the owner, issuer, serial number, and any extensions. If the \f2\-rfc\fP option is specified, certificate contents are printed using the printable encoding format, as defined by the Internet RFC 1421 standard
-+This command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, with additional information such as the owner, issuer, serial number, and any extensions. If the \f2\-rfc\fP option is specified, certificate contents are printed using the printable encoding format, as defined by the Internet RFC 1421 standard
- .LP
--You cannot specify both \f2\-v\fP and \f2\-rfc\fP.
-+You cannot specify both \f2\-v\fP and \f2\-rfc\fP.
- .TP 3
--\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
-+\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
- .LP
--Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin.
-+Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin.
- .LP
--If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard.
-+If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard.
- .LP
--If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard
-+If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard
- .LP
--If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the
-+If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the
- .na
- \f2JSSE Reference Guide\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information.
- .LP
--\f3Note\fP: This option can be used independently of a keystore.
-+\f3Note\fP: This option can be used independently of a keystore.
- .TP 3
--\-printcrl \-file crl_ {\-v}
-+\-printcrl \-file crl_ {\-v}
- .LP
--Reads the certificate revocation list (CRL) from the file \f2crl_file\fP.
-+Reads the certificate revocation list (CRL) from the file \f2crl_file\fP.
- .LP
--A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP.
-+A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP.
- .LP
--\f3Note\fP: This option can be used independently of a keystore.
-+\f3Note\fP: This option can be used independently of a keystore.
- .RE
-
- .LP
--.SS
-+.SS
- Managing the Keystore
- .LP
- .RS 3
- .TP 3
--\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
-+\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
- .LP
--Changes the password used to protect the integrity of the keystore contents. The new password is \f2new_storepass\fP, which must be at least 6 characters long.
-+Changes the password used to protect the integrity of the keystore contents. The new password is \f2new_storepass\fP, which must be at least 6 characters long.
- .TP 3
--\-keypasswd {\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
-+\-keypasswd {\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
- .LP
--Changes the password under which the private/secret key identified by \f2alias\fP is protected, from \f2old_keypass\fP to \f2new_keypass\fP, which must be at least 6 characters long.
-+Changes the password under which the private/secret key identified by \f2alias\fP is protected, from \f2old_keypass\fP to \f2new_keypass\fP, which must be at least 6 characters long.
- .LP
--If the \f2\-keypass\fP option is not provided at the command line, and the key password is different from the keystore password, the user is prompted for it.
-+If the \f2\-keypass\fP option is not provided at the command line, and the key password is different from the keystore password, the user is prompted for it.
- .LP
--If the \f2\-new\fP option is not provided at the command line, the user is prompted for it.
-+If the \f2\-new\fP option is not provided at the command line, the user is prompted for it.
- .TP 3
--\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Deletes from the keystore the entry identified by \f2alias\fP. The user is prompted for the alias, if no alias is provided at the command line.
-+Deletes from the keystore the entry identified by \f2alias\fP. The user is prompted for the alias, if no alias is provided at the command line.
- .TP 3
--\-changealias {\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-changealias {\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
- .LP
--Move an existing keystore entry from the specified \f2alias\fP to a new alias, \f2destalias\fP. If no destination alias is provided, the command will prompt for one. If the original entry is protected with an entry password, the password can be supplied via the "\-keypass" option. If no key password is provided, the \f2storepass\fP (if given) will be attempted first. If that attempt fails, the user will be prompted for a password.
-+Move an existing keystore entry from the specified \f2alias\fP to a new alias, \f2destalias\fP. If no destination alias is provided, the command will prompt for one. If the original entry is protected with an entry password, the password can be supplied via the "\-keypass" option. If no key password is provided, the \f2storepass\fP (if given) will be attempted first. If that attempt fails, the user will be prompted for a password.
- .RE
-
- .LP
--.SS
-+.SS
- Getting Help
- .LP
- .RS 3
- .TP 3
--\-help
-+\-help
- .LP
--Lists the basic commands and their options.
-+Lists the basic commands and their options.
- .LP
--For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command:
-+For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command:
- .nf
- \f3
- .fl
-@@ -995,7 +997,7 @@
- .LP
- Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust.
- .LP
--.SS
-+.SS
- Generating Your Key Pair
- .LP
- .LP
-@@ -1041,7 +1043,7 @@
- .LP
- The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US").
- .LP
--.SS
-+.SS
- Requesting a Signed Certificate from a Certification Authority
- .LP
- .LP
-@@ -1059,7 +1061,7 @@
- .LP
- This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.)
- .LP
--.SS
-+.SS
- Importing a Certificate for the CA
- .LP
- .LP
-@@ -1071,10 +1073,10 @@
- .RS 3
- .TP 2
- o
--If the certificate reply is a certificate chain, you just need the top certificate of the chain (that is, the "root" CA certificate authenticating that CA's public key).
-+If the certificate reply is a certificate chain, you just need the top certificate of the chain (that is, the "root" CA certificate authenticating that CA's public key).
- .TP 2
- o
--If the certificate reply is a single certificate, you need a certificate for the issuing CA (the one that signed it), and if that certificate is not self\-signed, you need a certificate for its signer, and so on, up to a self\-signed "root" CA certificate.
-+If the certificate reply is a single certificate, you need a certificate for the issuing CA (the one that signed it), and if that certificate is not self\-signed, you need a certificate for its signer, and so on, up to a self\-signed "root" CA certificate.
- .RE
-
- .LP
-@@ -1102,11 +1104,11 @@
- .LP
- This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry.
- .LP
--.SS
-+.SS
- Importing the Certificate Reply from the CA
- .LP
- .LP
--Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
-+Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there is already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
- .LP
- .LP
- For example, suppose you sent your certificate signing request to VeriSign. You can then import the reply via the following, which assumes the returned certificate is named "VSMarkJ.cer":
-@@ -1120,7 +1122,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Exporting a Certificate Authenticating Your Public Key
- .LP
- .LP
-@@ -1141,7 +1143,7 @@
- .LP
- Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature.
- .LP
--.SS
-+.SS
- Importing Keystore
- .LP
- .LP
-@@ -1189,7 +1191,7 @@
- .fi
-
- .LP
--.SS
-+.SS
- Generating Certificates for a Typical SSL Server
- .LP
- .LP
-@@ -1226,7 +1228,7 @@
- .LP
- .SH "TERMINOLOGY and WARNINGS"
- .LP
--.SS
-+.SS
- KeyStore
- .LP
- .LP
-@@ -1235,26 +1237,26 @@
- .RS 3
- .TP 2
- o
--\f3KeyStore Entries\fP
-+\f3KeyStore Entries\fP
- .LP
--Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include:
-+Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include:
- .RS 3
- .TP 3
- 1.
--\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
-+\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains.
- .TP 3
- 2.
--\f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate.
-+\f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate.
- .RE
- .TP 2
- o
--\f3KeyStore Aliases\fP
-+\f3KeyStore Aliases\fP
- .LP
--All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
-+All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP.
- .LP
--An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
-+An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity.
- .LP
--For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
-+For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command:
- .nf
- \f3
- .fl
-@@ -1263,7 +1265,7 @@
- \fP
- .fi
- .LP
--This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
-+This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following:
- .nf
- \f3
- .fl
-@@ -1272,36 +1274,36 @@
- \fP
- .fi
- .LP
--This changes the password from "dukekeypasswd" to "newpass".
-+This changes the password from "dukekeypasswd" to "newpass".
- .LP
--Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
-+Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it.
- .TP 2
- o
--\f3KeyStore Implementation\fP
-+\f3KeyStore Implementation\fP
- .LP
--The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
-+The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
- .LP
--Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
-+Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
- .LP
--There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
-+There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
- .LP
--Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in
-+Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in
- .na
- \f2How to Implement a Provider for the Java Cryptography Architecture\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
- .LP
--Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
-+Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
- .LP
--\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
-+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
- .LP
--For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
-+For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
- .LP
--If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-+If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
- .LP
--Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
-+Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
- .LP
--The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
-+The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
- .nf
- \f3
- .fl
-@@ -1310,7 +1312,7 @@
- \fP
- .fi
- .LP
--The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file:
-+The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file:
- .nf
- \f3
- .fl
-@@ -1319,9 +1321,9 @@
- \fP
- .fi
- .LP
--To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
-+To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type.
- .LP
--For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
-+For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
- .nf
- \f3
- .fl
-@@ -1330,100 +1332,100 @@
- \fP
- .fi
- .LP
--Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
-+Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
- .RE
-
- .LP
--.SS
-+.SS
- Certificate
- .LP
--A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
-+A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value.
- .RS 3
- .TP 2
- o
--\f3Certificate Terms\fP
-+\f3Certificate Terms\fP
- .RS 3
- .TP 3
--Public Keys
-+Public Keys
- .LP
--These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
-+These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
- .TP 3
--Digitally Signed
-+Digitally Signed
- .LP
--If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
-+If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
- .TP 3
--Identity
-+Identity
- .LP
--A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
-+A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
- .TP 3
--Signature
-+Signature
- .LP
--A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
-+A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
- .TP 3
--Private Keys
-+Private Keys
- .LP
--These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
-+These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
- .TP 3
--Entity
-+Entity
- .LP
--An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
-+An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
- .RE
- .LP
--Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as
-+Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as
- .na
- \f2VeriSign\fP @
- .fi
--http://www.verisign.com/,
-+http://www.verisign.com/,
- .na
- \f2Thawte\fP @
- .fi
--http://www.thawte.com/,
-+http://www.thawte.com/,
- .na
- \f2Entrust\fP @
- .fi
--http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization.
-+http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization.
- .LP
--Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
-+Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates.
- .LP
--\f3keytool\fP currently handles X.509 certificates.
-+\f3keytool\fP currently handles X.509 certificates.
- .TP 2
- o
--\f3X.509 Certificates\fP
-+\f3X.509 Certificates\fP
- .LP
--The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data.
-+The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data.
- .LP
--All X.509 certificates have the following data, in addition to the signature:
-+All X.509 certificates have the following data, in addition to the signature:
- .RS 3
- .TP 3
--Version
-+Version
- .LP
--This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates.
-+This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates.
- .LP
--\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic.
-+\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic.
- .LP
--\f2X.509 Version 2\fP introduced the concept of subject and issuer unique identifiers to handle the possibility of reuse of subject and/or issuer names over time. Most certificate profile documents strongly recommend that names not be reused, and that certificates should not make use of unique identifiers. Version 2 certificates are not widely used.
-+\f2X.509 Version 2\fP introduced the concept of subject and issuer unique identifiers to handle the possibility of reuse of subject and/or issuer names over time. Most certificate profile documents strongly recommend that names not be reused, and that certificates should not make use of unique identifiers. Version 2 certificates are not widely used.
- .LP
--\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.
-+\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.
- .TP 3
--Serial Number
-+Serial Number
- .LP
--The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
-+The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
- .TP 3
--Signature Algorithm Identifier
-+Signature Algorithm Identifier
- .LP
--This identifies the algorithm used by the CA to sign the certificate.
-+This identifies the algorithm used by the CA to sign the certificate.
- .TP 3
--Issuer Name
-+Issuer Name
- .LP
--The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
-+The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
- .TP 3
--Validity Period
-+Validity Period
- .LP
--Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
-+Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
- .TP 3
--Subject Name
-+Subject Name
- .LP
--The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example,
-+The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example,
- .nf
- \f3
- .fl
-@@ -1432,36 +1434,36 @@
- \fP
- .fi
- .LP
--(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
-+(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.)
- .TP 3
--Subject Public Key Information
-+Subject Public Key Information
- .LP
--This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
-+This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters.
- .RE
- .TP 2
- o
--\f3Certificate Chains\fP
-+\f3Certificate Chains\fP
- .LP
--\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
-+\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
- .LP
--When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
-+When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
- .LP
--Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
-+Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
- .LP
--In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
-+In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
- .LP
--Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
-+Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
- .LP
--A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
-+A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
- .LP
--The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).
-+The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).
- .TP 2
- o
--\f3The cacerts Certificates File\fP
-+\f3The cacerts Certificates File\fP
- .LP
--A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-+A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
- .LP
--The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command:
-+The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command:
- .nf
- \f3
- .fl
-@@ -1470,22 +1472,22 @@
- \fP
- .fi
- .LP
--The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
-+The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK.
- .LP
--\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
-+\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file.
- .TP 2
- o
--\f3The Internet RFC 1421 Certificate Encoding Standard\fP
-+\f3The Internet RFC 1421 Certificate Encoding Standard\fP
- .LP
--Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
-+Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
- .LP
--Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
-+Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
- .LP
--The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
-+The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
- .LP
--The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
-+The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
- .LP
--In its printable encoding format, the encoded certificate is bounded at the beginning by
-+In its printable encoding format, the encoded certificate is bounded at the beginning by
- .nf
- \f3
- .fl
-@@ -1494,7 +1496,7 @@
- \fP
- .fi
- .LP
--and at the end by
-+and at the end by
- .nf
- \f3
- .fl
-@@ -1505,7 +1507,7 @@
- .RE
-
- .LP
--.SS
-+.SS
- X.500 Distinguished Names
- .LP
- .LP
-@@ -1514,22 +1516,22 @@
- .RS 3
- .TP 2
- o
--\f2commonName\fP \- common name of a person, e.g., "Susan Jones"
-+\f2commonName\fP \- common name of a person, e.g., "Susan Jones"
- .TP 2
- o
--\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing"
-+\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing"
- .TP 2
- o
--\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc."
-+\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc."
- .TP 2
- o
--\f2localityName\fP \- locality (city) name, e.g., "Palo Alto"
-+\f2localityName\fP \- locality (city) name, e.g., "Palo Alto"
- .TP 2
- o
--\f2stateName\fP \- state or province name, e.g., "California"
-+\f2stateName\fP \- state or province name, e.g., "California"
- .TP 2
- o
--\f2country\fP \- two\-letter country code, e.g., "CH"
-+\f2country\fP \- two\-letter country code, e.g., "CH"
- .RE
-
- .LP
-@@ -1623,7 +1625,7 @@
- .LP
- It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\".
- .LP
--.SS
-+.SS
- WARNING Regarding Importing Trusted Certificates
- .LP
- .LP
-@@ -1665,7 +1667,7 @@
- .LP
- Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user.
- .LP
--.SS
-+.SS
- Warning Regarding Passwords
- .LP
- .LP
-@@ -1677,11 +1679,11 @@
- .LP
- If you don't specify a required password option on a command line, you will be prompted for it.
- .LP
--.SS
-+.SS
- Warning Regarding Certificate Conformance
- .LP
- .LP
--The Internet standard
-+The Internet standard
- .na
- \f2RFC 5280\fP @
- .fi
-@@ -1692,21 +1694,21 @@
- .RS 3
- .TP 2
- o
--jar(1) tool documentation
-+jar(1) tool documentation
- .TP 2
- o
--jarsigner(1) tool documentation
-+jarsigner(1) tool documentation
- .TP 2
- o
--the
-+the
- .na
- \f4Security\fP @
- .fi
--http://download.oracle.com/javase/tutorial/security/index.html trail of the
-+http://docs.oracle.com/javase/tutorial/security/index.html trail of the
- .na
- \f4Java Tutorial\fP @
- .fi
--http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP
-+http://docs.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP
- .RE
-
- .LP
-@@ -1727,13 +1729,13 @@
- .RS 3
- .TP 2
- o
--\f2\-export\fP, renamed to \f2\-exportcert\fP
-+\f2\-export\fP, renamed to \f2\-exportcert\fP
- .TP 2
- o
--\f2\-genkey\fP, renamed to \f2\-genkeypair\fP
-+\f2\-genkey\fP, renamed to \f2\-genkeypair\fP
- .TP 2
- o
--\f2\-import\fP, renamed to \f2\-importcert\fP
-+\f2\-import\fP, renamed to \f2\-importcert\fP
- .RE
-
- .LP
-@@ -1746,20 +1748,20 @@
- .na
- \f2\-keyclone\fP @
- .fi
--http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd
-+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd
- .TP 2
- o
- .na
- \f2\-identitydb\fP @
- .fi
--http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd
-+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd
- .TP 2
- o
- .na
- \f2\-selfcert\fP @
- .fi
--http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd
-+http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/native2ascii.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/native2ascii.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH native2ascii 1 "10 May 2011"
-+.TH native2ascii 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -50,23 +50,23 @@
- .LP
- .RS 3
- .TP 3
--\-reverse
-+\-reverse
- Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment.
- .br
- .br
- .TP 3
--\-encoding encoding_name
--Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the
-+\-encoding encoding_name
-+Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the
- .na
- \f4Supported Encodings\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
- .br
- .br
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/orbd.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/orbd.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH orbd 1 "10 May 2011"
-+.TH orbd 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -29,11 +29,11 @@
- \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment.
- .LP
- .LP
--\f3See also:\fP
-+\f3See also:\fP
- .na
- \f2Naming Service\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
- .LP
- .SH "SYNOPSIS"
- .LP
-@@ -54,10 +54,10 @@
- .RS 3
- .TP 2
- o
--The object reference in the Naming Service remains independent of the server life cycle. For example, the object reference could be published by the server in the Naming Service when it is first installed, and then, independent of how many times the server is started or shutdown, the ORBD will always return the correct object reference to the invoking client.
-+The object reference in the Naming Service remains independent of the server life cycle. For example, the object reference could be published by the server in the Naming Service when it is first installed, and then, independent of how many times the server is started or shutdown, the ORBD will always return the correct object reference to the invoking client.
- .TP 2
- o
--The client needs to lookup the object reference in the Naming Service only once, and can keep re\-using this reference independent of the changes introduced due to server life cycle.
-+The client needs to lookup the object reference in the Naming Service only once, and can keep re\-using this reference independent of the changes introduced due to server life cycle.
- .RE
-
- .LP
-@@ -65,79 +65,79 @@
- To access ORBD's Server Manager, the server must be started using servertool(1), which is a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. For more information on the Server Manager, see the section in this document titled \f2Server Manager\fP.
- .LP
- .LP
--When \f2orbd\fP starts up, it also starts a naming service. For more information on the naming service, link to
-+When \f2orbd\fP starts up, it also starts a naming service. For more information on the naming service, link to
- .na
- \f2Naming Service\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
- .LP
- .SH "OPTIONS"
- .LP
--.SS
-+.SS
- Required Options
- .LP
- .RS 3
- .TP 3
--\-ORBInitialPort nameserverport
--Specifies the port on which the name server should be started. Once started, \f2orbd\fP will listen for incoming requests on this port. Note that when using Solaris software, you must become root to start a process on a port under 1024. For this reason, we recommend that you use a port number greater than or equal to 1024. (required)
-+\-ORBInitialPort nameserverport
-+Specifies the port on which the name server should be started. Once started, \f2orbd\fP will listen for incoming requests on this port. Note that when using Solaris software, you must become root to start a process on a port under 1024. For this reason, we recommend that you use a port number greater than or equal to 1024. (required)
- .RE
-
- .LP
- .LP
-
- .LP
--.SS
-+.SS
- OTHER OPTIONS
- .LP
- .RS 3
- .TP 3
--\-port port
--Specifies the activation port where ORBD should be started, and where ORBD will be accepting requests for persistent objects. The default value for this port is 1049. This port number is added to the port field of the persistent Interoperable Object References (IOR). (optional)
-+\-port port
-+Specifies the activation port where ORBD should be started, and where ORBD will be accepting requests for persistent objects. The default value for this port is 1049. This port number is added to the port field of the persistent Interoperable Object References (IOR). (optional)
- .RE
-
- .LP
- .RS 3
- .TP 3
--\-defaultdb directory
--Specifies the base where the ORBD persistent storage directory \f2orb.db\fP is created. If this option is not specified, the default value is "./orb.db". (optional)
-+\-defaultdb directory
-+Specifies the base where the ORBD persistent storage directory \f2orb.db\fP is created. If this option is not specified, the default value is "./orb.db". (optional)
- .RE
-
- .LP
- .RS 3
- .TP 3
--\-serverPollingTime milliseconds
--Specifies how often ORBD checks for the health of persistent servers registered via \f2servertool\fP. The default value is 1,000 ms. The value specified for \f2milliseconds\fP must be a valid positive integer. (optional)
-+\-serverPollingTime milliseconds
-+Specifies how often ORBD checks for the health of persistent servers registered via \f2servertool\fP. The default value is 1,000 ms. The value specified for \f2milliseconds\fP must be a valid positive integer. (optional)
- .RE
-
- .LP
- .RS 3
- .TP 3
--\-serverStartupDelay milliseconds
--Specifies how long ORBD waits before sending a location forward exception after a persistent server that is registered via \f2servertool\fP is restarted. The default value is 1,000 ms. The value specified for \f2milliseconds\fP must be a valid positive integer. (optional)
-+\-serverStartupDelay milliseconds
-+Specifies how long ORBD waits before sending a location forward exception after a persistent server that is registered via \f2servertool\fP is restarted. The default value is 1,000 ms. The value specified for \f2milliseconds\fP must be a valid positive integer. (optional)
- .RE
-
- .LP
- .RS 3
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
- .TP 3
--
-+
- .RE
-
- .LP
- .SH "Starting and Stopping the Naming Service"
- .LP
- .LP
--A Naming Service is a CORBA service that allows
-+A Naming Service is a CORBA service that allows
- .na
- \f2CORBA objects\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The
- .na
- \f2name binding\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
- .LP
- .LP
- Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service.
-@@ -146,7 +146,7 @@
- The \f4Persistent\fP\f3 Naming Service\fP provides persistence for naming contexts. This means that this information is persistent across service shutdowns and startups, and is recoverable in the event of a service failure. If ORBD is restarted, the Persistent Naming Service will restore the naming context graph, so that the binding of all clients' and servers' names remains intact (persistent).
- .LP
- .LP
--\
-+\
- .LP
- .LP
- For backward compatibility, \f2tnameserv\fP, a \f4Transient\fP\f3 Naming Service\fP shipped with older versions of the JDK, is also included in this release of J2SE. A transient naming service retains naming contexts as long as it is running. If there is a service interruption, the naming context graph is lost.
-@@ -212,26 +212,26 @@
- To stop the naming service, use the relevant operating system command, such as \f2pkill orbd\fP on Solaris, or \f2Ctrl+C\fP in the DOS window in which \f2orbd\fP is running. Note that names registered with the naming service may disappear when the service is terminated if the naming service is transient. The Java IDL naming service will run until it is explicitly stopped.
- .LP
- .LP
--For more information on the Naming Service included with ORBD, see
-+For more information on the Naming Service included with ORBD, see
- .na
- \f2Naming Service\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
- .LP
- .SH "Server Manager"
- .LP
- .LP
- To access ORBD's Server Manager and run a persistent server, the server must be started using servertool(1), which is a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. When a server is started using \f2servertool\fP, it must be started on the same host and port on which \f2orbd\fP is executing. If the server is run on a different port, the information stored in the database for local contexts will be invalid and the service will not work properly.
- .LP
--.SS
-+.SS
- Server Manager: an Example
- .LP
- .LP
--Using the
-+Using the
- .na
- \f2sample tutorial\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
- .LP
- .LP
- Start \f2orbd\fP.
-@@ -240,12 +240,12 @@
- To start \f2orbd\fP from a UNIX command shell, enter:
- .LP
- .LP
--\
-+\
- .LP
- .nf
- \f3
- .fl
-- orbd \-ORBInitialPort 1050
-+ orbd \-ORBInitialPort 1050
- .fl
- \fP
- .fi
-@@ -314,7 +314,7 @@
- Run the client application from another terminal window or prompt:
- .LP
- .LP
--\
-+\
- .LP
- .nf
- \f3
-@@ -332,10 +332,10 @@
- Specify the name server (\f2orbd\fP) port as done in the previous step, for example, \f2\-ORBInitialPort 1050\fP.
- .LP
- .LP
--\
-+\
- .LP
- .LP
--\
-+\
- .LP
- .LP
- When you have finished experimenting with the Server Manager, be sure to shut down or kill the name server (\f2orbd\fP) and \f2servertool\fP.
-@@ -354,15 +354,15 @@
- .na
- \f2Naming Service\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
- .br
- .TP 2
- o
--servertool(1)
-+servertool(1)
- .RE
-
- .LP
- .br
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/pack200.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/pack200.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH pack200 1 "10 May 2011"
-+.TH pack200 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -35,14 +35,14 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options.
-+options
-+Command\-line options.
- .TP 3
--output\-file
--Name of the output file.
-+output\-file
-+Name of the output file.
- .TP 3
--JAR\-file
--Name of the input file.
-+JAR\-file
-+Name of the input file.
- .RE
-
- .LP
-@@ -54,7 +54,7 @@
- .LP
- The \f2pack200\fP tool uses several options to fine\-tune and set the compression engine.
- .LP
--.SS
-+.SS
- Typical usage:
- .LP
- .LP
-@@ -138,17 +138,17 @@
- .LP
- .RS 3
- .TP 3
--true
-+true
- .TP 3
--false
--In either case, the packer will set the deflation hint accordingly in the output archive, and will not transmit the individual deflation hints of archive elements.
-+false
-+In either case, the packer will set the deflation hint accordingly in the output archive, and will not transmit the individual deflation hints of archive elements.
- .RE
-
- .LP
- .RS 3
- .TP 3
--keep
--Preserve deflation hints observed in the input JAR. (This is the default.)
-+keep
-+Preserve deflation hints observed in the input JAR. (This is the default.)
- .RE
-
- .LP
-@@ -160,11 +160,11 @@
- .LP
- .RS 3
- .TP 3
--latest
--The packer will attempt to determine the latest modification time, among all the available entries in the original archive, or the latest modification time of all the available entries in that segment. This single value will be transmitted as part of the segment and applied to all the entries in each segment. This can marginally decrease the transmitted size of the archive at the expense of setting all installed files to a single date.
-+latest
-+The packer will attempt to determine the latest modification time, among all the available entries in the original archive, or the latest modification time of all the available entries in that segment. This single value will be transmitted as part of the segment and applied to all the entries in each segment. This can marginally decrease the transmitted size of the archive at the expense of setting all installed files to a single date.
- .TP 3
--keep
--Preserves modification times observed in the input JAR. (This is the default.)
-+keep
-+Preserves modification times observed in the input JAR. (This is the default.)
- .RE
-
- .LP
-@@ -182,14 +182,14 @@
- .LP
- .RS 3
- .TP 3
--error
--The \f2pack200\fP operation as a whole will fail with a suitable explanation.
-+error
-+The \f2pack200\fP operation as a whole will fail with a suitable explanation.
- .TP 3
--strip
--The attribute will be dropped. Note: Removing the required VM attributes may cause Class Loader failures.
-+strip
-+The attribute will be dropped. Note: Removing the required VM attributes may cause Class Loader failures.
- .TP 3
--pass
--Upon encountering this attribute, the entire class will be transmitted as though it is a resource.
-+pass
-+Upon encountering this attribute, the entire class will be transmitted as though it is a resource.
- .RE
-
- .LP
-@@ -207,16 +207,16 @@
- .LP
- .RS 3
- .TP 3
--some\-layout\-string
--The layout language is defined in the JSR 200 specification.
-+some\-layout\-string
-+The layout language is defined in the JSR 200 specification.
- .LP
--Example: \f2\-\-class\-attribute=SourceFile=RUH\fP
-+Example: \f2\-\-class\-attribute=SourceFile=RUH\fP
- .TP 3
--error
--Upon encountering this attribute, the pack200 operation will fail with a suitable explanation.
-+error
-+Upon encountering this attribute, the pack200 operation will fail with a suitable explanation.
- .TP 3
--strip
--Upon encountering this attribute, the attribute will be removed from the output. Note: removing VM\-required attributes may cause Class Loader failures.
-+strip
-+Upon encountering this attribute, the attribute will be removed from the output. Note: removing VM\-required attributes may cause Class Loader failures.
- .RE
-
- .LP
-@@ -304,28 +304,28 @@
- .RS 3
- .TP 2
- o
--unpack200(1)
-+unpack200(1)
- .TP 2
- o
- .na
- \f2Java SE Documentation\fP @
- .fi
--http://download.oracle.com/javase/7/docs/index.html
-+http://docs.oracle.com/javase/7/docs/index.html
- .TP 2
- o
- .na
- \f2Java Deployment Guide \- Pack200\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
- .TP 2
- o
--jar(1) \- Java Archive Tool
-+jar(1) \- Java Archive Tool
- .TP 2
- o
--jarsigner(1) \- JAR Signer tool
-+jarsigner(1) \- JAR Signer tool
- .TP 2
- o
--\f2attributes(5)\fP man page
-+\f2attributes(5)\fP man page
- .RE
-
- .LP
-@@ -337,4 +337,4 @@
- .LP
- The Java SE API Specification provided with the JDK is the superseding authority, in case of discrepancies.
- .LP
--
-+
---- jdk/src/bsd/doc/man/policytool.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/policytool.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,71 +19,86 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH policytool 1 "10 May 2011"
-+.TH policytool 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- policytool \- PolicyTool Administration GUI Utility
- .LP
--\f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI.
-+\f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI.
- .SH "SYNOPSIS"
- .LP
--.RS 3
--.TP 3
--\
--.TP 3
-+.LP
- Run the policytool Administrator's utility
-+.LP
-+.LP
- \f4policytool\fP
--.TP 3
-+.LP
-+.LP
- Run policytool and load the specified policy file
-+.LP
-+.LP
- \f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
--.TP 3
--\
--.TP 3
-+.LP
-+.LP
- where:
-+.LP
- .RS 3
- .TP 3
--file
--directs \f2policytool\fP to load a local policy file
-+file
-+directs \f2policytool\fP to load a local policy file
- .TP 3
--filename
--The file name
-+filename
-+The file name
- .RE
-+
-+.LP
- .SH "DESCRIPTION"
- .LP
--\f3policytool\fP is a GUI that allows users to create and manage policy files. For details, see
-+.LP
-+\f3policytool\fP is a GUI that allows users to create and manage policy files. For details, see
- .na
- \f2the Policytool Users Guide\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html.
-+.LP
- .SH "OPTIONS"
-+.LP
- .RS 3
- .TP 3
--file
--Loads \f2filename\fP.
-+file
-+Loads \f2filename\fP.
-+.RE
-+
-+.LP
- .SH "SEE ALSO"
-+.LP
- .na
- \f2Default Policy Implementation and Syntax\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
- .br
-+
-+.LP
- .na
- \f2Policy Tool Users' Guide\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
- .br
-+
-+.LP
- .na
- \f2Security Permissions\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
- .br
-+
-+.LP
- .na
- \f2Security Overview\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
- .br
--.RE
--.RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/rmic.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/rmic.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH rmic 1 "10 May 2011"
-+.TH rmic 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -75,11 +75,11 @@
- .LP
- .RS 3
- .TP 3
--\-bootclasspath path
--Overrides location of bootstrap class files
-+\-bootclasspath path
-+Overrides location of bootstrap class files
- .TP 3
--\-classpath path
--Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
-+\-classpath path
-+Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
- .nf
- \f3
- .fl
-@@ -87,7 +87,7 @@
- .fl
- \fP
- .fi
--For example:
-+For example:
- .nf
- \f3
- .fl
-@@ -96,8 +96,8 @@
- \fP
- .fi
- .TP 3
--\-d directory
--Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command
-+\-d directory
-+Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command
- .nf
- \f3
- .fl
-@@ -107,43 +107,43 @@
- .fi
- would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.)
- .br
--\
-+\
- .TP 3
--\-extdirs path
--Overrides location of installed extensions
-+\-extdirs path
-+Overrides location of installed extensions
- .TP 3
--\-g
--Enables generation of all debugging information, including local variables. By default, only line number information is generated.
-+\-g
-+Enables generation of all debugging information, including local variables. By default, only line number information is generated.
- .TP 3
--\-idl
--Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the
-+\-idl
-+Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the
- .na
- \f2Java Language to IDL Mapping\fP @
- .fi
- http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description.
- .br
- .br
--When the \f2\-idl\fP option is used, other options also include:
-+When the \f2\-idl\fP option is used, other options also include:
- .RS 3
- .TP 3
--\-always or \-alwaysgenerate
--Forces re\-generation even when existing stubs/ties/IDL are newer than the input class.
-+\-always or \-alwaysgenerate
-+Forces re\-generation even when existing stubs/ties/IDL are newer than the input class.
- .TP 3
--\-factory
--Uses factory keyword in generated IDL.
-+\-factory
-+Uses factory keyword in generated IDL.
- .TP 3
--\-idlModule\ fromJavaPackage[.class]\ toIDLModule
--Specifies IDLEntity package mapping. For example:\ \f2\-idlModule foo.bar my::real::idlmod\fP.
-+\-idlModule\ fromJavaPackage[.class]\ toIDLModule
-+Specifies IDLEntity package mapping. For example:\ \f2\-idlModule foo.bar my::real::idlmod\fP.
- .TP 3
--\-idlFile\ fromJavaPackage[.class]\ toIDLFile
--Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\
-+\-idlFile\ fromJavaPackage[.class]\ toIDLFile
-+Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\
- .RE
- .TP 3
--\-iiop
-+\-iiop
- Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class.
- .br
- .br
--Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention:
-+Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention:
- .nf
- \f3
- .fl
-@@ -153,49 +153,49 @@
- .fl
- \fP
- .fi
--When the \f2\-iiop\fP option is used, other options also include:
-+When the \f2\-iiop\fP option is used, other options also include:
- .RS 3
- .TP 3
--\-always or \-alwaysgenerate
--Forces re\-generation even when existing stubs/ties/IDL are newer than the input class.
-+\-always or \-alwaysgenerate
-+Forces re\-generation even when existing stubs/ties/IDL are newer than the input class.
- .TP 3
--\-nolocalstubs
--Do not create stubs optimized for same\-process clients and servers.
-+\-nolocalstubs
-+Do not create stubs optimized for same\-process clients and servers.
- .TP 3
--\-noValueMethods
--Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option.
-+\-noValueMethods
-+Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option.
- .TP 3
--\-poa
--Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the
-+\-poa
-+Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the
- .na
- \f2Portable Object Adapter\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf.
- .RE
- .TP 3
--\-J
--Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter.
-+\-J
-+Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter.
- .TP 3
--\-keep or \-keepgenerated
--Retains the generated \f2.java\fP source files for the stub, skeleton, and/or tie classes and writes them to the same directory as the \f2.class\fP files.
-+\-keep or \-keepgenerated
-+Retains the generated \f2.java\fP source files for the stub, skeleton, and/or tie classes and writes them to the same directory as the \f2.class\fP files.
- .TP 3
--\-nowarn
--Turns off warnings. If used the compiler does not print out any warnings.
-+\-nowarn
-+Turns off warnings. If used the compiler does not print out any warnings.
- .TP 3
--\-nowrite
--Does not write compiled classes to the file system.
-+\-nowrite
-+Does not write compiled classes to the file system.
- .TP 3
--\-vcompat
--Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation.
-+\-vcompat
-+Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation.
- .TP 3
--\-verbose
--Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded.
-+\-verbose
-+Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded.
- .TP 3
--\-v1.1
--Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used).
-+\-v1.1
-+Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used).
- .TP 3
--\-v1.2
--(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine.
-+\-v1.2
-+(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine.
- .RE
-
- .LP
-@@ -203,8 +203,8 @@
- .LP
- .RS 3
- .TP 3
--CLASSPATH
--Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example,
-+CLASSPATH
-+Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example,
- .nf
- \f3
- .fl
-@@ -218,10 +218,10 @@
- .SH "SEE ALSO"
- .LP
- .LP
--java(1), javac(1),
-+java(1), javac(1),
- .na
- \f2CLASSPATH\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
- .LP
--
-+
---- jdk/src/bsd/doc/man/rmid.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/rmid.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH rmid 1 "10 May 2011"
-+.TH rmid 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -42,15 +42,15 @@
- .SH "DESCRIPTION"
- .LP
- .LP
--The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the
-+The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the
- .na
- \f2Java RMI Specification\fP @
- .fi
--http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and
-+http://docs.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and
- .na
- \f2Activation tutorials\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
- .LP
- .LP
- The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows:
-@@ -73,10 +73,10 @@
- .RS 3
- .TP 2
- o
--starts the Activator and an internal registry on the default port, 1098, and
-+starts the Activator and an internal registry on the default port, 1098, and
- .TP 2
- o
--binds an \f2ActivationSystem\fP to the name \f2java.rmi.activation.ActivationSystem\fP in this internal registry.
-+binds an \f2ActivationSystem\fP to the name \f2java.rmi.activation.ActivationSystem\fP in this internal registry.
- .RE
-
- .LP
-@@ -95,11 +95,11 @@
- .LP
- starts the activation system daemon and a registry on the registry's default port, 1099.
- .LP
--.SS
-+.SS
- Starting rmid from inetd/xinetd
- .LP
- .LP
--An alternative to starting \f2rmid\fP from the command line is to configure \f2inetd\fP (Solaris) or \f2xinetd\fP (Bsd) to start \f2rmid\fP on demand.
-+An alternative to starting \f2rmid\fP from the command line is to configure \f2inetd\fP (Solaris) or \f2xinetd\fP (Linux or BSD) to start \f2rmid\fP on demand.
- .LP
- .LP
- When \f2rmid\fP starts up, it attempts to obtain an inherited channel (inherited from \f2inetd\fP/\f2xinetd\fP) by invoking the \f2System.inheritedChannel\fP method. If the inherited channel is \f2null\fP or not an instance of \f2java.nio.channels.ServerSocketChannel\fP, then \f2rmid\fP assumes that it was not started by \f2inetd\fP/\f2xinetd\fP, and it starts up as described above.
-@@ -110,25 +110,25 @@
- .RS 3
- .TP 2
- o
--Output printed to \f2System.err\fP is redirected to a file. This file is located in the directory specified by the \f2java.io.tmpdir\fP system property (typically \f2/var/tmp\fP or \f2/tmp\fP) with the prefix \f2"rmid\-err"\fP and the suffix \f2"tmp"\fP.
-+Output printed to \f2System.err\fP is redirected to a file. This file is located in the directory specified by the \f2java.io.tmpdir\fP system property (typically \f2/var/tmp\fP or \f2/tmp\fP) with the prefix \f2"rmid\-err"\fP and the suffix \f2"tmp"\fP.
- .TP 2
- o
--The \f2\-port\fP option is disallowed. If this option is specified, \f2rmid\fP will exit with an error message.
-+The \f2\-port\fP option is disallowed. If this option is specified, \f2rmid\fP will exit with an error message.
- .TP 2
- o
--The \f2\-log\fP option is required. If this option is not specified, \f2rmid\fP will exit with an error message.
-+The \f2\-log\fP option is required. If this option is not specified, \f2rmid\fP will exit with an error message.
- .RE
-
- .LP
- .LP
--See the man pages for \f2inetd\fP (Solaris) or \f2xinetd\fP (Bsd) for details on how to configure services to be started on demand.
-+See the man pages for \f2inetd\fP (Solaris) or \f2xinetd\fP (Linux or BSD) for details on how to configure services to be started on demand.
- .LP
- .SH "OPTIONS"
- .LP
- .RS 3
- .TP 3
--\-C<someCommandLineOption>
--Specifies an option that is passed as a command\-line argument to each child process (activation group) of \f2rmid\fP when that process is created. For example, you could pass a property to each virtual machine spawned by the activation system daemon:
-+\-C<someCommandLineOption>
-+Specifies an option that is passed as a command\-line argument to each child process (activation group) of \f2rmid\fP when that process is created. For example, you could pass a property to each virtual machine spawned by the activation system daemon:
- .nf
- \f3
- .fl
-@@ -136,7 +136,7 @@
- .fl
- \fP
- .fi
--This ability to pass command\-line arguments to child processes can be useful for debugging. For example, the following command:
-+This ability to pass command\-line arguments to child processes can be useful for debugging. For example, the following command:
- .nf
- \f3
- .fl
-@@ -144,11 +144,11 @@
- .fl
- \fP
- .fi
--will enable server\-call logging in all child VMs.
-+will enable server\-call logging in all child VMs.
- .LP
- .TP 3
--\-J<someCommandLineOption>
--Specifies an option that is passed to the \f2java\fP interpreter running \f2rmid\fP. For example, to specify that \f2rmid\fP use a policy file named \f2rmid.policy\fP, the \f2\-J\fP option can be used to define the \f2java.security.policy\fP property on \f2rmid\fP's command line, for example:
-+\-J<someCommandLineOption>
-+Specifies an option that is passed to the \f2java\fP interpreter running \f2rmid\fP. For example, to specify that \f2rmid\fP use a policy file named \f2rmid.policy\fP, the \f2\-J\fP option can be used to define the \f2java.security.policy\fP property on \f2rmid\fP's command line, for example:
- .nf
- \f3
- .fl
-@@ -157,16 +157,16 @@
- \fP
- .fi
- .TP 3
--\-J\-Dsun.rmi.activation.execPolicy=<policy>
--Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP:
-+\-J\-Dsun.rmi.activation.execPolicy=<policy>
-+Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP:
- .RS 3
- .TP 2
- o
--\f3default (or if this property is \fP\f4unspecified\fP\f3)\fP
-+\f3default (or if this property is \fP\f4unspecified\fP\f3)\fP
- .LP
--The default \f2execPolicy\fP allows \f2rmid\fP to execute commands with specific command\-line options only if \f2rmid\fP has been granted permission to execute those commands and options in the security policy file that \f2rmid\fP uses. Only the default activation group implementation can be used with the \f2default\fP execution policy.
-+The default \f2execPolicy\fP allows \f2rmid\fP to execute commands with specific command\-line options only if \f2rmid\fP has been granted permission to execute those commands and options in the security policy file that \f2rmid\fP uses. Only the default activation group implementation can be used with the \f2default\fP execution policy.
- .LP
--\f2rmid\fP launches a VM for an activation group using the information in the group's registered activation group descriptor, an \f2ActivationGroupDesc\fP. The group descriptor specifies an optional \f2ActivationGroupDesc.CommandEnvironment\fP which includes the \f2command\fP to execute to start the activation group as well as any command line \f2options\fP to be added to the command line. By default, \f2rmid\fP uses the \f2java\fP command found in \f2java.home\fP. The group descriptor also contains \f2properties\fP overrides that are added to the command line as options defined as:
-+\f2rmid\fP launches a VM for an activation group using the information in the group's registered activation group descriptor, an \f2ActivationGroupDesc\fP. The group descriptor specifies an optional \f2ActivationGroupDesc.CommandEnvironment\fP which includes the \f2command\fP to execute to start the activation group as well as any command line \f2options\fP to be added to the command line. By default, \f2rmid\fP uses the \f2java\fP command found in \f2java.home\fP. The group descriptor also contains \f2properties\fP overrides that are added to the command line as options defined as:
- .nf
- \f3
- .fl
-@@ -175,33 +175,33 @@
- \fP
- .fi
- .LP
--The permission \f2com.sun.rmi.rmid.ExecPermission\fP is used to grant \f2rmid\fP permission to execute a command, specified in the group descriptor's \f2CommandEnvironment\fP to launch an activation group. The permission \f2com.sun.rmi.rmid.ExecOptionPermission\fP is used to allow \f2rmid\fP to use command\-line options, specified as properties overrides in the group descriptor or as options in the \f2CommandEnvironment\fP, when launching the activation group.
-+The permission \f2com.sun.rmi.rmid.ExecPermission\fP is used to grant \f2rmid\fP permission to execute a command, specified in the group descriptor's \f2CommandEnvironment\fP to launch an activation group. The permission \f2com.sun.rmi.rmid.ExecOptionPermission\fP is used to allow \f2rmid\fP to use command\-line options, specified as properties overrides in the group descriptor or as options in the \f2CommandEnvironment\fP, when launching the activation group.
- .LP
--When granting \f2rmid\fP permission to execute various commands and options, the permissions \f2ExecPermission\fP and \f2ExecOptionPermission\fP need to be granted universally (i.e., granted to all code sources).
-+When granting \f2rmid\fP permission to execute various commands and options, the permissions \f2ExecPermission\fP and \f2ExecOptionPermission\fP need to be granted universally (i.e., granted to all code sources).
- .RS 3
- .TP 3
--ExecPermission
--The \f2ExecPermission\fP class represents permission for \f2rmid\fP to execute a specific \f2command\fP to launch an activation group.
-+ExecPermission
-+The \f2ExecPermission\fP class represents permission for \f2rmid\fP to execute a specific \f2command\fP to launch an activation group.
- .LP
- \f3Syntax\fP
- .br
--The \f2name\fP of an \f2ExecPermission\fP is the path name of a command to grant \f2rmid\fP permission to execute. A path name that ends in "/*" indicates all the files contained in that directory (where "/" is the file\-separator character, \f2File.separatorChar\fP). A path name that ends with "/\-" indicates all files and subdirectories contained in that directory (recursively). A path name consisting of the special token "<<ALL FILES>>" matches \f3any\fP file.
-+The \f2name\fP of an \f2ExecPermission\fP is the path name of a command to grant \f2rmid\fP permission to execute. A path name that ends in "/*" indicates all the files contained in that directory (where "/" is the file\-separator character, \f2File.separatorChar\fP). A path name that ends with "/\-" indicates all files and subdirectories contained in that directory (recursively). A path name consisting of the special token "<<ALL FILES>>" matches \f3any\fP file.
- .LP
--\f3Note:\fP A path name consisting of a single "*" indicates all the files in the current directory, while a path name consisting of a single "\-" indicates all the files in the current directory and (recursively) all files and subdirectories contained in the current directory.
-+\f3Note:\fP A path name consisting of a single "*" indicates all the files in the current directory, while a path name consisting of a single "\-" indicates all the files in the current directory and (recursively) all files and subdirectories contained in the current directory.
- .TP 3
--ExecOptionPermission
--The \f2ExecOptionPermission\fP class represents permission for \f2rmid\fP to use a specific command\-line \f2option\fP when launching an activation group. The \f2name\fP of an \f2ExecOptionPermission\fP is the value of a command line option.
-+ExecOptionPermission
-+The \f2ExecOptionPermission\fP class represents permission for \f2rmid\fP to use a specific command\-line \f2option\fP when launching an activation group. The \f2name\fP of an \f2ExecOptionPermission\fP is the value of a command line option.
- .LP
- \f3Syntax\fP
- .br
--Options support a limited wildcard scheme. An asterisk signifies a wildcard match, and it may appear as the option name itself (i.e., it matches any option), or an asterisk may appear at the end of the option name only if the asterisk follows either a "." or "=".
-+Options support a limited wildcard scheme. An asterisk signifies a wildcard match, and it may appear as the option name itself (i.e., it matches any option), or an asterisk may appear at the end of the option name only if the asterisk follows either a "." or "=".
- .LP
--For example: "*" or "\-Dfoo.*" or "\-Da.b.c=*" is valid, "*foo" or "\-Da*b" or "ab*" is not.
-+For example: "*" or "\-Dfoo.*" or "\-Da.b.c=*" is valid, "*foo" or "\-Da*b" or "ab*" is not.
- .TP 3
--Policy file for rmid
--When granting \f2rmid\fP permission to execute various commands and options, the permissions \f2ExecPermission\fP and \f2ExecOptionPermission\fP need to be granted universally (i.e., granted to all code sources). It is safe to grant these permissions universally because only \f2rmid\fP checks these permissions.
-+Policy file for rmid
-+When granting \f2rmid\fP permission to execute various commands and options, the permissions \f2ExecPermission\fP and \f2ExecOptionPermission\fP need to be granted universally (i.e., granted to all code sources). It is safe to grant these permissions universally because only \f2rmid\fP checks these permissions.
- .LP
--An example policy file that grants various execute permissions to \f2rmid\fP is:
-+An example policy file that grants various execute permissions to \f2rmid\fP is:
- .nf
- \f3
- .fl
-@@ -239,21 +239,21 @@
- .fl
- \fP
- .fi
--The first permission granted allow \f2rmid\fP to execute the 1.7.0 version of the \f2java\fP command, specified by its explicit path name. Note that by default, the version of the \f2java\fP command found in \f2java.home\fP is used (the same one that \f2rmid\fP uses), and does not need to be specified in the policy file. The second permission allows \f2rmid\fP to execute any command in the directory \f2/files/apps/rmidcmds\fP.
-+The first permission granted allow \f2rmid\fP to execute the 1.7.0 version of the \f2java\fP command, specified by its explicit path name. Note that by default, the version of the \f2java\fP command found in \f2java.home\fP is used (the same one that \f2rmid\fP uses), and does not need to be specified in the policy file. The second permission allows \f2rmid\fP to execute any command in the directory \f2/files/apps/rmidcmds\fP.
- .LP
--The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups.
-+The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups.
- .LP
--To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example:
-+To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example:
- .LP
--\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
-+\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
- .RE
- .TP 2
- o
--\f4<policyClassName>\fP
-+\f4<policyClassName>\fP
- .LP
--If the default behavior is not flexible enough, an administrator can provide, when starting \f2rmid\fP, the name of a class whose \f2checkExecCommand\fP method is executed in order to check commands to be executed by rmid.
-+If the default behavior is not flexible enough, an administrator can provide, when starting \f2rmid\fP, the name of a class whose \f2checkExecCommand\fP method is executed in order to check commands to be executed by rmid.
- .LP
--The \f2policyClassName\fP specifies a public class with a public, no\-argument constructor and an implementation of the following \f2checkExecCommand\fP method:
-+The \f2policyClassName\fP specifies a public class with a public, no\-argument constructor and an implementation of the following \f2checkExecCommand\fP method:
- .nf
- \f3
- .fl
-@@ -265,25 +265,25 @@
- .fl
- \fP
- .fi
--Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object.
-+Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object.
- .TP 2
- o
--\f3none\fP
-+\f3none\fP
- .LP
--If the \f2sun.rmi.activation.execPolicy\fP property value is "none", then \f2rmid\fP will not perform any validation of commands to launch activation groups.
-+If the \f2sun.rmi.activation.execPolicy\fP property value is "none", then \f2rmid\fP will not perform any validation of commands to launch activation groups.
- .RE
- .LP
- .TP 3
--\-log dir
--Specifies the name of the directory the activation system daemon uses to write its database and associated information. The log directory defaults to creating a directory, \f2log\fP, in the directory in which the \f2rmid\fP command was executed.
-+\-log dir
-+Specifies the name of the directory the activation system daemon uses to write its database and associated information. The log directory defaults to creating a directory, \f2log\fP, in the directory in which the \f2rmid\fP command was executed.
- .LP
- .TP 3
--\-port port
--Specifies the port \f2rmid\fP's registry uses. The activation system daemon binds the \f2ActivationSystem\fP, with the name \f2java.rmi.activation.ActivationSystem\fP, in this registry. Thus, the \f2ActivationSystem\fP on the local machine can be obtained using the following \f2Naming.lookup\fP method call:
-+\-port port
-+Specifies the port \f2rmid\fP's registry uses. The activation system daemon binds the \f2ActivationSystem\fP, with the name \f2java.rmi.activation.ActivationSystem\fP, in this registry. Thus, the \f2ActivationSystem\fP on the local machine can be obtained using the following \f2Naming.lookup\fP method call:
- .nf
- \f3
- .fl
-- import java.rmi.*;
-+ import java.rmi.*;
- .fl
- import java.rmi.activation.*;
- .fl
-@@ -295,8 +295,8 @@
- .fl
- .fi
- .TP 3
--\-stop
--Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098.
-+\-stop
-+Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098.
- .RE
-
- .LP
-@@ -304,8 +304,8 @@
- .LP
- .RS 3
- .TP 3
--CLASSPATH
--Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example:
-+CLASSPATH
-+Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example:
- .nf
- \f3
- .fl
-@@ -319,10 +319,10 @@
- .SH "SEE ALSO"
- .LP
- .LP
--rmic(1),
-+rmic(1),
- .na
- \f2CLASSPATH\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
-+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
- .LP
--
-+
---- jdk/src/bsd/doc/man/rmiregistry.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/rmiregistry.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,14 +19,14 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH rmiregistry 1 "10 May 2011"
-+.TH rmiregistry 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- rmiregistry \- The Java Remote Object Registry
- .LP
- .RS 3
--The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
-+The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host.
- .RE
-
- .LP
-@@ -65,19 +65,19 @@
- .LP
- .RS 3
- .TP 3
--\-J
--Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter.
-+\-J
-+Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter.
- .RE
-
- .LP
- .SH "SEE ALSO"
- .LP
--java(1),
-+java(1),
- .na
- \f2java.rmi.registry.LocateRegistry\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and
-+http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and
- .na
- \f2java.rmi.Naming\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
-+http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html
---- jdk/src/bsd/doc/man/schemagen.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/schemagen.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH schemagen 1 "10 May 2011"
-+.TH schemagen 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -39,7 +39,7 @@
- The current schema generator can process either Java source files or class files.
- .LP
- .LP
--We also provide an Ant task to run the schema generator \- see the instructions for
-+We also provide an Ant task to run the schema generator \- see the instructions for
- .na
- \f2using schemagen with Ant\fP @
- .fi
-@@ -59,13 +59,13 @@
- .LP
- If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema.
- .LP
--.SS
-+.SS
- Command Line Options
- .LP
- .nf
- \f3
- .fl
--Usage: schemagen [\-options ...] <java files>
-+Usage: schemagen [\-options ...] <java files>
- .fl
-
- .fl
-@@ -94,7 +94,7 @@
- .SH "Generated Resource Files"
- .LP
- .LP
--The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use
-+The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use
- .na
- \f2the schema generator ant task\fP @
- .fi
-@@ -110,18 +110,18 @@
- .na
- \f2command\-line instructions\fP @
- .fi
--https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagen.html,
-+https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagen.html,
- .na
- \f2using the SchemaGen Ant task\fP @
- .fi
--https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html]
-+https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html]
- .TP 2
- o
- .na
- \f2Java Architecture for XML Binding (JAXB)\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
- .RE
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/serialver.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/serialver.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH serialver 1 "10 May 2011"
-+.TH serialver 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -40,11 +40,11 @@
- .LP
- .RS 3
- .TP 3
--options
--Command\-line options, as specified in this document.
-+options
-+Command\-line options, as specified in this document.
- .TP 3
--classnames
--One or more class names
-+classnames
-+One or more class names
- .RE
-
- .LP
-@@ -57,18 +57,18 @@
- .LP
- .RS 3
- .TP 3
--\-classpath <directories and zip/jar files separated by :>
--Set search path for application classes and resources.
-+\-classpath <directories and zip/jar files separated by :>
-+Set search path for application classes and resources.
- .RE
-
- .LP
- .RS 3
- .TP 3
--\-show
--Displays a simple user interface. Enter the full class name and press either the Enter key or the Show button to display the serialVersionUID.
-+\-show
-+Displays a simple user interface. Enter the full class name and press either the Enter key or the Show button to display the serialVersionUID.
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
- .RE
-
- .LP
-@@ -92,6 +92,6 @@
- .na
- \f2java.io.ObjectStreamClass\fP @
- .fi
--http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
-+http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
- .LP
--
-+
---- jdk/src/bsd/doc/man/servertool.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/servertool.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,13 +19,13 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH servertool 1 "10 May 2011"
-+.TH servertool 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- servertool \- The Java(TM) IDL Server Tool
- .LP
--\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
-+\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server.
- .SH "SYNOPSIS"
- .LP
- .nf
-@@ -55,11 +55,11 @@
- .LP
- .RS 3
- .TP 3
--\-ORBInitialHost nameserverhost
--Specifies the host machine on which the name server is running and listening for incoming requests. The \f2nameserverhost\fP defaults to \f2localhost\fP if this option is not specified. If \f2orbd\fP and \f2servertool\fP are running on different machines, you must specify the name or IP address of the host on which \f2orbd\fP is running.
-+\-ORBInitialHost nameserverhost
-+Specifies the host machine on which the name server is running and listening for incoming requests. The \f2nameserverhost\fP defaults to \f2localhost\fP if this option is not specified. If \f2orbd\fP and \f2servertool\fP are running on different machines, you must specify the name or IP address of the host on which \f2orbd\fP is running.
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
- .RE
-
- .LP
-@@ -67,47 +67,47 @@
- .LP
- .RS 3
- .TP 3
--register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ]
--Register a new persistent server with the Object Request Broker Daemon (ORBD). If the server is not already registered, it is registered and activated. This command causes an install method to be invoked in the main class of the server identified by the \f2\-server\fP option. The install method must be \f2public static void install(org.omg.CORBA.ORB)\fP. The install method is optional and enables the developer to provide their own server installation behavior (for example, creating database schema).
-+register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ]
-+Register a new persistent server with the Object Request Broker Daemon (ORBD). If the server is not already registered, it is registered and activated. This command causes an install method to be invoked in the main class of the server identified by the \f2\-server\fP option. The install method must be \f2public static void install(org.omg.CORBA.ORB)\fP. The install method is optional and enables the developer to provide their own server installation behavior (for example, creating database schema).
- .TP 3
--unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
--Unregister a server from the ORBD by using either its server id or its application name. This command causes an uninstall method to be invoked in the main class of the server identified by the \f2\-server\fP option. The uninstall method must be \f2public static void uninstall(org.omg.CORBA.ORB)\fP. The uninstall method is optional and enables the developer to provide their own server uninstall behavior (for example, undoing the behavior of the install method).
-+unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
-+Unregister a server from the ORBD by using either its server id or its application name. This command causes an uninstall method to be invoked in the main class of the server identified by the \f2\-server\fP option. The uninstall method must be \f2public static void uninstall(org.omg.CORBA.ORB)\fP. The uninstall method is optional and enables the developer to provide their own server uninstall behavior (for example, undoing the behavior of the install method).
- .TP 3
--getserverid \-applicationName\ <application\ name>
--Return the server id that corresponds with an application.
-+getserverid \-applicationName\ <application\ name>
-+Return the server id that corresponds with an application.
- .TP 3
--list
--List information about all persistent servers registered with the ORBD.
-+list
-+List information about all persistent servers registered with the ORBD.
- .TP 3
--listappnames
--List the application names for all servers currently registered with the ORBD.
-+listappnames
-+List the application names for all servers currently registered with the ORBD.
- .TP 3
--listactive
--List information about all persistent servers that have been launched by the ORBD and are currently running.
-+listactive
-+List information about all persistent servers that have been launched by the ORBD and are currently running.
- .TP 3
--locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ]
--Locate the endpoints (ports) of a specific type for all ORBs created by a registered server. If a server is not already running, it is activated. If an endpoint type is not specified, then the plain/non\-protected endpoint associated with each ORB in a server is returned.
-+locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ]
-+Locate the endpoints (ports) of a specific type for all ORBs created by a registered server. If a server is not already running, it is activated. If an endpoint type is not specified, then the plain/non\-protected endpoint associated with each ORB in a server is returned.
- .TP 3
--locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ]
--Locate all the endpoints (ports) registered by a specific ORB of registered server. If a server is not already running, then it is activated. If an \f2orbid\fP is not specified, the default value of "" is assigned to the \f2orbid\fP. If any ORBs are created with an \f2orbid\fP of empty string, all ports registered by it are returned.
-+locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ]
-+Locate all the endpoints (ports) registered by a specific ORB of registered server. If a server is not already running, then it is activated. If an \f2orbid\fP is not specified, the default value of "" is assigned to the \f2orbid\fP. If any ORBs are created with an \f2orbid\fP of empty string, all ports registered by it are returned.
- .TP 3
--orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
--Lists the ORBId of the ORBs defined on a server. An ORBId is the string name for the ORB created by the server. If the server is not already running, it is activated.
-+orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
-+Lists the ORBId of the ORBs defined on a server. An ORBId is the string name for the ORB created by the server. If the server is not already running, it is activated.
- .TP 3
--shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
--Shutdown an active server that is registered with ORBD. During execution of this command, the \f2shutdown()\fP method defined in the class specified by either the \f2\-serverid\fP or \f2\-applicationName\fP parameter is also invoked to shutdown the server process appropriately.
-+shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
-+Shutdown an active server that is registered with ORBD. During execution of this command, the \f2shutdown()\fP method defined in the class specified by either the \f2\-serverid\fP or \f2\-applicationName\fP parameter is also invoked to shutdown the server process appropriately.
- .TP 3
--startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
--Startup or activate a server that is registered with ORBD. If the server is not running, this command launches the server. If the server is already running, an error message is returned to the user.
-+startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
-+Startup or activate a server that is registered with ORBD. If the server is not running, this command launches the server. If the server is already running, an error message is returned to the user.
- .TP 3
--help
--List all the commands available to the server through the server tool.
-+help
-+List all the commands available to the server through the server tool.
- .TP 3
--quit
--Exit the server tool.
-+quit
-+Exit the server tool.
- .RE
-
- .LP
- .SH "SEE ALSO"
- .LP
--orbd(1)
-+orbd(1)
---- jdk/src/bsd/doc/man/tnameserv.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/tnameserv.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,18 +19,18 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH tnameserv 1 "10 May 2011"
-+.TH tnameserv 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
- Java IDL: Transient Naming Service \- \f2tnameserv\fP
- .LP
- .LP
--This document discusses using the Java IDL Transient Naming Service, \f2tnameserv\fP. Java IDL also includes the Object Request Broker Daemon (ORBD). ORBD is a daemon process containing a Bootstrap Service, a Transient Naming Service, a \f3Persistent\fP Naming Service, and a Server Manager. The Java IDL tutorials all use ORBD, however, you can substitute \f2tnameserv\fP for \f2orbd\fP in any of the examples that use a Transient Naming Service. For documentation on the \f2orbd\fP tool, link to its orbd(1) or the
-+This document discusses using the Java IDL Transient Naming Service, \f2tnameserv\fP. Java IDL also includes the Object Request Broker Daemon (ORBD). ORBD is a daemon process containing a Bootstrap Service, a Transient Naming Service, a \f3Persistent\fP Naming Service, and a Server Manager. The Java IDL tutorials all use ORBD, however, you can substitute \f2tnameserv\fP for \f2orbd\fP in any of the examples that use a Transient Naming Service. For documentation on the \f2orbd\fP tool, link to its orbd(1) or the
- .na
- \f2Java IDL Naming Service Included with ORBD\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
- .LP
- .LP
- Topics in this section include:
-@@ -38,19 +38,19 @@
- .RS 3
- .TP 2
- o
--Java\ IDL Transient Naming Service
-+Java\ IDL Transient Naming Service
- .TP 2
- o
--Starting the Java\ IDL Transient Naming Service
-+Starting the Java\ IDL Transient Naming Service
- .TP 2
- o
--Stopping the Java\ IDL Transient Naming Service
-+Stopping the Java\ IDL Transient Naming Service
- .TP 2
- o
--Sample Client: Adding Objects to the Namespace
-+Sample Client: Adding Objects to the Namespace
- .TP 2
- o
--Sample Client: Browsing the Namespace
-+Sample Client: Browsing the Namespace
- .RE
-
- .LP
-@@ -109,22 +109,22 @@
- .LP
- Clients of the name server must be made aware of the new port number. Do this by setting the \f2org.omg.CORBA.ORBInitialPort\fP property to the new port number when creating the ORB object.
- .LP
--.SS
-+.SS
- Running the server and client on different hosts
- .LP
- .LP
- In most of the Java IDL and RMI\-IIOP tutorials, the Naming Service, Server, and Client are all running on the development machine. In real world deployment, it is likely that the client and server will run on different host machines than the Naming Service.
- .LP
- .LP
--For the client and server to find the Naming Service, they must be made aware of the port number and host on which the naming service is running. Do this by setting the \f2org.omg.CORBA.ORBInitialPort\fP and \f2org.omg.CORBA.ORBInitialHost\fP properties in the client and server files to the machine name and port number on which the Naming Service is running. An example of this is shown in
-+For the client and server to find the Naming Service, they must be made aware of the port number and host on which the naming service is running. Do this by setting the \f2org.omg.CORBA.ORBInitialPort\fP and \f2org.omg.CORBA.ORBInitialHost\fP properties in the client and server files to the machine name and port number on which the Naming Service is running. An example of this is shown in
- .na
- \f2The Hello World Example Using RMI\-IIOP\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service.
- .na
- \f2Java IDL: Running the Hello World Example on TWO Machines\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
- .LP
- .LP
- For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP.
-@@ -132,7 +132,7 @@
- .RS 3
- .TP 2
- o
--Start \f2tnameserv\fP on the host \f2nameserverhost\fP, as follows:
-+Start \f2tnameserv\fP on the host \f2nameserverhost\fP, as follows:
- .nf
- \f3
- .fl
-@@ -144,7 +144,7 @@
- .fi
- .TP 2
- o
--Start the server on the \f2serverhost\fP, as follows:
-+Start the server on the \f2serverhost\fP, as follows:
- .nf
- \f3
- .fl
-@@ -154,7 +154,7 @@
- .fi
- .TP 2
- o
--Start the client on the \f2clienthost\fP, as follows:
-+Start the client on the \f2clienthost\fP, as follows:
- .nf
- \f3
- .fl
-@@ -165,14 +165,14 @@
- .RE
-
- .LP
--.SS
-+.SS
- The \-J option
- .LP
--This command\-line option is available for use with \f2tnameserve\fP:
-+This command\-line option is available for use with \f2tnameserve\fP:
- .RS 3
- .TP 3
--\-Joption
--Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
-+\-Joption
-+Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine.
- .RE
-
- .LP
-@@ -189,21 +189,21 @@
- .RS 3
- .TP 2
- o
--\f4Initial Naming Context\fP
-+\f4Initial Naming Context\fP
- .RS 3
- .TP 2
- *
--\f3plans\fP
-+\f3plans\fP
- .TP 2
- *
--\f4Personal\fP
-+\f4Personal\fP
- .RS 3
- .TP 2
- -
--\f3calendar\fP
-+\f3calendar\fP
- .TP 2
- -
--\f3schedule\fP
-+\f3schedule\fP
- .RE
- .RE
- .RE
-@@ -237,7 +237,7 @@
- .fi
-
- .LP
--In the above section, Starting the Java IDL Transient Naming Service, the nameserver was started on port 1050. The following code ensures that the client program is aware of this port number.
-+In the above section, Starting the Java IDL Transient Naming Service, the nameserver was started on port 1050. The following code ensures that the client program is aware of this port number.
- .nf
- \f3
- .fl
-@@ -253,7 +253,7 @@
- .fi
-
- .LP
--This code obtains the initial naming context and assigns it to \f3ctx\fP. The second line copies \f3ctx\fP into a dummy object reference \f3objref\fP that we'll attach to various names and add into the namespace.
-+This code obtains the initial naming context and assigns it to \f3ctx\fP. The second line copies \f3ctx\fP into a dummy object reference \f3objref\fP that we'll attach to various names and add into the namespace.
- .nf
- \f3
- .fl
-@@ -269,7 +269,7 @@
- .fi
-
- .LP
--This code creates a name "plans" of type "text" and binds it to our dummy object reference. "plans" is then added under the initial naming context using \f2rebind\fP. The \f2rebind\fP method allows us to run this program over and over again without getting the exceptions we'd get from using \f2bind\fP.
-+This code creates a name "plans" of type "text" and binds it to our dummy object reference. "plans" is then added under the initial naming context using \f2rebind\fP. The \f2rebind\fP method allows us to run this program over and over again without getting the exceptions we'd get from using \f2bind\fP.
- .nf
- \f3
- .fl
-@@ -279,7 +279,7 @@
- .fl
- ctx.rebind(name1, objref);
- .fl
-- System.out.println("plans rebind sucessful!");
-+ System.out.println("plans rebind successful!");
- .fl
-
- .fl
-@@ -287,7 +287,7 @@
- .fi
-
- .LP
--This code creates a naming context called "Personal" of type "directory". The resulting object reference, \f3ctx2\fP, is bound to the name and added under the initial naming context.
-+This code creates a naming context called "Personal" of type "directory". The resulting object reference, \f3ctx2\fP, is bound to the name and added under the initial naming context.
- .nf
- \f3
- .fl
-@@ -305,7 +305,7 @@
- .fi
-
- .LP
--The remainder of the code binds the dummy object reference using the names "schedule" and "calendar" under the "Personal" naming context (\f3ctx2\fP).
-+The remainder of the code binds the dummy object reference using the names "schedule" and "calendar" under the "Personal" naming context (\f3ctx2\fP).
- .nf
- \f3
- .fl
-@@ -315,7 +315,7 @@
- .fl
- ctx2.rebind(name3, objref);
- .fl
-- System.out.println("schedule rebind sucessful!");
-+ System.out.println("schedule rebind successful!");
- .fl
-
- .fl
-@@ -325,7 +325,7 @@
- .fl
- ctx2.rebind(name4, objref);
- .fl
-- System.out.println("calender rebind sucessful!");
-+ System.out.println("calender rebind successful!");
- .fl
-
- .fl
-@@ -375,7 +375,7 @@
- .fi
-
- .LP
--In the above section, Starting the Java IDL Transient Naming Service, the nameserver was started on port 1050. The following code ensures that the client program is aware of this port number.
-+In the above section, Starting the Java IDL Transient Naming Service, the nameserver was started on port 1050. The following code ensures that the client program is aware of this port number.
- .nf
- \f3
- .fl
-@@ -395,7 +395,7 @@
- .fi
-
- .LP
--The following code obtains the intial naming context.
-+The following code obtains the initial naming context.
- .nf
- \f3
- .fl
-@@ -409,7 +409,7 @@
- .fi
-
- .LP
--The \f2list\fP method lists the bindings in the naming context. In this case, up to 1000 bindings from the initial naming context will be returned in the BindingListHolder; any remaining bindings are returned in the BindingIteratorHolder.
-+The \f2list\fP method lists the bindings in the naming context. In this case, up to 1000 bindings from the initial naming context will be returned in the BindingListHolder; any remaining bindings are returned in the BindingIteratorHolder.
- .nf
- \f3
- .fl
-@@ -425,7 +425,7 @@
- .fi
-
- .LP
--This code gets the array of bindings out of the returned BindingListHolder. If there are no bindings, the program ends.
-+This code gets the array of bindings out of the returned BindingListHolder. If there are no bindings, the program ends.
- .nf
- \f3
- .fl
-@@ -439,7 +439,7 @@
- .fi
-
- .LP
--The remainder of the code loops through the bindings and prints the names out.
-+The remainder of the code loops through the bindings and prints the names out.
- .nf
- \f3
- .fl
-@@ -491,4 +491,4 @@
- .fi
-
- .LP
--
-+
---- jdk/src/bsd/doc/man/unpack200.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/unpack200.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH unpack200 1 "10 May 2011"
-+.TH unpack200 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -35,11 +35,11 @@
- .LP
- .RS 3
- .TP 3
--input\-file
--Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker.
-+input\-file
-+Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker.
- .TP 3
--JAR\-file
--Name of the output JAR file.
-+JAR\-file
-+Name of the output JAR file.
- .RE
-
- .LP
-@@ -120,28 +120,28 @@
- .RS 3
- .TP 2
- o
--pack200(1)
-+pack200(1)
- .TP 2
- o
- .na
- \f2Java SE Documentation\fP @
- .fi
--http://download.oracle.com/javase/7/docs/index.html
-+http://docs.oracle.com/javase/7/docs/index.html
- .TP 2
- o
- .na
- \f2Java Deployment Guide \- Pack200\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
- .TP 2
- o
--jar(1) \- Java Archive Tool
-+jar(1) \- Java Archive Tool
- .TP 2
- o
--jarsigner(1) \- JAR Signer tool
-+jarsigner(1) \- JAR Signer tool
- .TP 2
- o
--\f2attributes(5)\fP man page
-+\f2attributes(5)\fP man page
- .RE
-
- .LP
-@@ -153,4 +153,4 @@
- .LP
- The Java SE API Specification provided with the JDK is the superseding authority, in case of discrepancies.
- .LP
--
-+
---- jdk/src/bsd/doc/man/wsgen.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/wsgen.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH wsgen 1 "10 May 2011"
-+.TH wsgen 1 "16 Mar 2012"
- .SH "Name"
- wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
- .LP
-@@ -30,7 +30,7 @@
- The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation
- .SH "Overview"
- .LP
--The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see
-+The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see
- .na
- \f2Wsgen ant task\fP @
- .fi
-@@ -40,25 +40,25 @@
- .RS 3
- .TP 2
- o
--\f3Solaris/Bsd\fP
-+\f3Solaris/Linux/BSD\fP
- .RS 3
- .TP 2
- *
--\f2export JAXWS_HOME=/pathto/jaxws\-ri\fP
-+\f2export JAXWS_HOME=/pathto/jaxws\-ri\fP
- .TP 2
- *
--\f2$JAXWS_HOME/bin/wsgen.sh \-help\fP
-+\f2$JAXWS_HOME/bin/wsgen.sh \-help\fP
- .RE
- .TP 2
- o
--\f3Windows\fP
-+\f3Windows\fP
- .RS 3
- .TP 2
- *
--\f2set JAXWS_HOME=c:\\pathto\\jaxws\-ri\fP
-+\f2set JAXWS_HOME=c:\\pathto\\jaxws\-ri\fP
- .TP 2
- *
--\f2%JAXWS_HOME%\\bin\\wsgen.bat \-help\fP
-+\f2%JAXWS_HOME%\\bin\\wsgen.bat \-help\fP
- .RE
- .RE
-
-@@ -77,6 +77,7 @@
- The following table lists the \f2wsgen\fP options.
- .br
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -361,13 +362,13 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-classpath <path>\fP\h'|\n(41u'
-@@ -383,7 +384,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-cp <path>\fP\h'|\n(41u'
-@@ -399,7 +400,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-d <directory>\fP\h'|\n(41u'
-@@ -415,7 +416,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-extension\fP\h'|\n(41u'
-@@ -429,17 +430,17 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-help\fP\h'|\n(41u'Display help
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-keep\fP\h'|\n(41u'Keep generated files
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-r <directory>\fP\h'|\n(41u'
-@@ -455,7 +456,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-s <directory>\fP\h'|\n(41u'
-@@ -471,7 +472,7 @@
- .sp |\n(31u
- .ne \n(g|u+\n(.Vu
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-verbose\fP\h'|\n(41u'
-@@ -487,7 +488,7 @@
- .sp |\n(31u
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-version\fP\h'|\n(41u'
-@@ -503,7 +504,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-wsdl[:protocol]\fP\h'|\n(41u'
-@@ -519,7 +520,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-servicename <name>\fP\h'|\n(41u'
-@@ -535,7 +536,7 @@
- .sp |\n(31u
- .ne \n(k|u+\n(.Vu
- .if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f4\-portname <name>\fP\h'|\n(41u'
-@@ -564,6 +565,7 @@
- .rm i+
- .rm j+
- .rm k+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-53
-
- .LP
-@@ -571,7 +573,7 @@
- .nf
- \f3
- .fl
--\fP\f3wsgen \-d stock \-cp myclasspath stock.StockService\fP
-+\fP\f3wsgen \-d stock \-cp myclasspath stock.StockService\fP
- .fl
- .fi
- .LP
-@@ -579,7 +581,7 @@
- .nf
- \f3
- .fl
--\fP\f3wsgen \-wsdl \-d stock \-cp myclasspath stock.StockService\fP
-+\fP\f3wsgen \-wsdl \-d stock \-cp myclasspath stock.StockService\fP
- .fl
- .fi
- .LP
-@@ -587,10 +589,10 @@
- .nf
- \f3
- .fl
--\fP\f3wsgen \-wsdl:Xsoap1.2 \-d stock \-cp myclasspath stock.StockService\fP
-+\fP\f3wsgen \-wsdl:Xsoap1.2 \-d stock \-cp myclasspath stock.StockService\fP
- .fl
- .fi
- .LP
- Will generate a SOAP 1.2 WSDL.
- .LP
--Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
-+Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
---- jdk/src/bsd/doc/man/wsimport.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/wsimport.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH wsimport 1 "10 May 2011"
-+.TH wsimport 1 "16 Mar 2012"
- .SH "Name"
- wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
- .LP
-@@ -33,22 +33,22 @@
- .RS 3
- .TP 2
- o
--Service Endpoint Interface (SEI)
-+Service Endpoint Interface (SEI)
- .TP 2
- o
--Service
-+Service
- .TP 2
- o
--Exception class mapped from wsdl:fault (if any)
-+Exception class mapped from wsdl:fault (if any)
- .TP 2
- o
--Async Reponse Bean derived from response wsdl:message (if any)
-+Async Reponse Bean derived from response wsdl:message (if any)
- .TP 2
- o
--JAXB generated value types (mapped java classes from schema types)
-+JAXB generated value types (mapped java classes from schema types)
- .RE
- .LP
--These artifacts can be packaged in a WAR file with the WSDL and schema documents along with the endpoint implementation to be deployed. also provides wsimport ant task, see
-+These artifacts can be packaged in a WAR file with the WSDL and schema documents along with the endpoint implementation to be deployed. also provides wsimport ant task, see
- .na
- \f2Wsimport ant task\fP @
- .fi
-@@ -60,19 +60,19 @@
- .RS 3
- .TP 2
- o
--\f3Solaris/Bsd\fP
-+\f3Solaris/Linux/BSD\fP
- .RS 3
- .TP 2
- *
--\f2/bin/wsimport.sh \-help\fP
-+\f2/bin/wsimport.sh \-help\fP
- .RE
- .TP 2
- o
--\f3Windows\fP
-+\f3Windows\fP
- .RS 3
- .TP 2
- *
--\f2\\bin\\wsimport.bat \-help\fP
-+\f2\\bin\\wsimport.bat \-help\fP
- .RE
- .RE
-
-@@ -88,6 +88,7 @@
- .LP
- The following table lists the \f2wsimport\fP options.
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -431,13 +432,13 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-d <directory> \fP\h'|\n(41u'
-@@ -453,7 +454,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-b <path> \fP\h'|\n(41u'
-@@ -469,7 +470,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-B <jaxbOption>\fP\h'|\n(41u'
-@@ -485,7 +486,7 @@
- .sp |\n(31u
- .ne \n(d|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-catalog\fP\h'|\n(41u'
-@@ -501,7 +502,7 @@
- .sp |\n(31u
- .ne \n(e|u+\n(.Vu
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-extension \fP\h'|\n(41u'
-@@ -515,7 +516,7 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-help \fP\h'|\n(41u'Display help
-@@ -523,7 +524,7 @@
- .ne \n(g|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
- .if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -544,13 +545,13 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-keep \fP\h'|\n(41u'Keep generated files
- .ne \n(h|u+\n(.Vu
- .if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-p \fP\h'|\n(41u'
-@@ -566,7 +567,7 @@
- .sp |\n(31u
- .ne \n(i|u+\n(.Vu
- .if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-s <directory> \fP\h'|\n(41u'
-@@ -582,7 +583,7 @@
- .sp |\n(31u
- .ne \n(j|u+\n(.Vu
- .if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-verbose \fP\h'|\n(41u'
-@@ -598,7 +599,7 @@
- .sp |\n(31u
- .ne \n(k|u+\n(.Vu
- .if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-version \fP\h'|\n(41u'
-@@ -616,7 +617,7 @@
- .ne \n(m|u+\n(.Vu
- .if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
- .if (\n(m|+\n(#^-1v)>\n(#- .nr #- +(\n(m|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -639,7 +640,7 @@
- .sp |\n(31u
- .ne \n(n|u+\n(.Vu
- .if (\n(n|+\n(#^-1v)>\n(#- .nr #- +(\n(n|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-target \fP\h'|\n(41u'
-@@ -653,7 +654,7 @@
- .mk 32
- .if \n(32>\n(31 .nr 31 \n(32
- .sp |\n(31u
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-quiet \fP\h'|\n(41u'Suppress wsimport output
-@@ -675,9 +676,10 @@
- .rm l+
- .rm m+
- .rm n+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-66
- .LP
--Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the
-+Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the
- .na
- \f2customization documentation\fP @
- .fi
-@@ -685,6 +687,7 @@
- .LP
- The following table lists \f2wsimport\fP non\-standard options:
- .LP
-+.TS
- .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
- .de 35
- .ps \n(.s
-@@ -856,13 +859,13 @@
- .ls
- ..
- .ec
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP
- .ne \n(a|u+\n(.Vu
- .if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u'
-@@ -878,7 +881,7 @@
- .sp |\n(31u
- .ne \n(b|u+\n(.Vu
- .if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u'
-@@ -894,7 +897,7 @@
- .sp |\n(31u
- .ne \n(c|u+\n(.Vu
- .if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u'
-@@ -912,7 +915,7 @@
- .ne \n(e|u+\n(.Vu
- .if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
- .if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\h'|\n(41u'
-@@ -935,7 +938,7 @@
- .sp |\n(31u
- .ne \n(f|u+\n(.Vu
- .if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u
-+.ta \n(80u \n(81u
- .nr 31 \n(.f
- .nr 35 1m
- \&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u'
-@@ -959,6 +962,7 @@
- .rm d+
- .rm e+
- .rm f+
-+.TE
- .if \n-(b.=0 .nr c. \n(.c-\n(d.-26
-
- .LP
-@@ -972,4 +976,4 @@
- .LP
- This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP.
- .br
--
-+
---- jdk/src/bsd/doc/man/xjc.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/bsd/doc/man/xjc.1 2014-01-18 12:16:33.000000000 -0800
-@@ -19,7 +19,7 @@
- ." or visit www.oracle.com if you need additional information or have any
- ." questions.
- ."
--.TH xjc 1 "10 May 2011"
-+.TH xjc 1 "16 Mar 2012"
-
- .LP
- .SH "Name"
-@@ -35,7 +35,7 @@
- .SH "Launching xjc"
- .LP
- .LP
--The binding compiler can be launched using the appropriate \f2xjc\fP shell script in the \f2bin\fP directory for your platform. We also provide an Ant task to run the binding complier \- see the instructions for
-+The binding compiler can be launched using the appropriate \f2xjc\fP shell script in the \f2bin\fP directory for your platform. We also provide an Ant task to run the binding complier \- see the instructions for
- .na
- \f2using the XJC Ant task\fP @
- .fi
-@@ -44,7 +44,7 @@
- .LP
- \f2% xjc \-help\fP
- .LP
--.SS
-+.SS
- Output
- .LP
- .nf
-@@ -124,115 +124,115 @@
- .LP
- .RS 3
- .TP 3
--\-nv
--By default, the XJC binding compiler performs strict validation of the source schema before processing it. Use this option to disable strict schema validation. This does not mean that the binding compiler will not perform any validation, it simply means that it will perform less\-strict validation.
-+\-nv
-+By default, the XJC binding compiler performs strict validation of the source schema before processing it. Use this option to disable strict schema validation. This does not mean that the binding compiler will not perform any validation, it simply means that it will perform less\-strict validation.
- .TP 3
--\-extension
--By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions
-+\-extension
-+By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions
- .TP 3
--\-b <file>
-+\-b <file>
- Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
- .br
--\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter.
-+\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter.
- .TP 3
--\-d <dir>
--By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you.
-+\-d <dir>
-+By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you.
- .TP 3
--\-p <pkg>
--Specifying a target package via this command\-line option overrides any binding customization for package name and the default package name algorithm defined in the specification.
-+\-p <pkg>
-+Specifying a target package via this command\-line option overrides any binding customization for package name and the default package name algorithm defined in the specification.
- .TP 3
--\-httpproxy <proxy>
--Specify the HTTP/HTTPS proxy. The format is [user[:password]@]proxyHost[:proxyPort]. The old \f2\-host\fP and \f2\-port\fP are still supported by the RI for backwards compatibility, but they have been deprecated. Note that the password specified with this option is an argument that is visible to other users who use the \f2top\fP command, for example. For greater security, use \f2\-httpproxyfile\fP, below.
-+\-httpproxy <proxy>
-+Specify the HTTP/HTTPS proxy. The format is [user[:password]@]proxyHost[:proxyPort]. The old \f2\-host\fP and \f2\-port\fP are still supported by the RI for backwards compatibility, but they have been deprecated. Note that the password specified with this option is an argument that is visible to other users who use the \f2top\fP command, for example. For greater security, use \f2\-httpproxyfile\fP, below.
- .TP 3
--\-httpproxyfile <file>
--Specify the HTTP/HTTPS proxy using a file. Same format as above, but the password specified in the file is not visible to other users.
-+\-httpproxyfile <file>
-+Specify the HTTP/HTTPS proxy using a file. Same format as above, but the password specified in the file is not visible to other users.
- .TP 3
--\-classpath <arg>
--Specify where to find client application class files used by the \f2<jxb:javaType>\fP and \f2<xjc:superClass>\fP customizations.
-+\-classpath <arg>
-+Specify where to find client application class files used by the \f2<jxb:javaType>\fP and \f2<xjc:superClass>\fP customizations.
- .TP 3
--\-catalog <file>
--Specify catalog files to resolve external entity references. Supports TR9401, XCatalog, and OASIS XML Catalog format. Please read the XML Entity and URI Resolvers document or the \f2catalog\-resolver\fP sample application.
-+\-catalog <file>
-+Specify catalog files to resolve external entity references. Supports TR9401, XCatalog, and OASIS XML Catalog format. Please read the XML Entity and URI Resolvers document or the \f2catalog\-resolver\fP sample application.
- .TP 3
--\-readOnly
--By default, the XJC binding compiler does not write\-protect the Java source files it generates. Use this option to force the XJC binding compiler to mark the generated Java sources read\-only.
-+\-readOnly
-+By default, the XJC binding compiler does not write\-protect the Java source files it generates. Use this option to force the XJC binding compiler to mark the generated Java sources read\-only.
- .TP 3
--\-npa
--Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes.
-+\-npa
-+Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes.
- .TP 3
--\-no\-header
--Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly.
-+\-no\-header
-+Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly.
- .TP 3
--\-target 2.0
--Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.)
-+\-target 2.0
-+Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.)
- .TP 3
--\-xmlschema
--Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema.
-+\-xmlschema
-+Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema.
- .TP 3
--\-relaxng
--Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-relaxng
-+Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
- .TP 3
--\-relaxng\-compact
--Treat input schemas as RELAX NG compact syntax(experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-relaxng\-compact
-+Treat input schemas as RELAX NG compact syntax(experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
- .TP 3
--\-dtd
--Treat input schemas as XML DTD (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-dtd
-+Treat input schemas as XML DTD (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
- .TP 3
--\-wsdl
--Treat input as WSDL and compile schemas inside it (experimental,unsupported).
-+\-wsdl
-+Treat input as WSDL and compile schemas inside it (experimental,unsupported).
- .TP 3
--\-quiet
--Suppress compiler output, such as progress information and warnings.
-+\-quiet
-+Suppress compiler output, such as progress information and warnings.
- .TP 3
--\-verbose
--Be extra verbose, such as printing informational messages or displaying stack traces upon some errors.
-+\-verbose
-+Be extra verbose, such as printing informational messages or displaying stack traces upon some errors.
- .TP 3
--\-help
--Display a brief summary of the compiler switches.
-+\-help
-+Display a brief summary of the compiler switches.
- .TP 3
--\-version
--Display the compiler version information.
-+\-version
-+Display the compiler version information.
- .TP 3
--<schema file/URL/dir>
--Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them.
-+<schema file/URL/dir>
-+Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them.
- .RE
-
- .LP
--.SS
-+.SS
- Non\-Standard Command Line Options
- .LP
- .RS 3
- .TP 3
--\-Xlocator
--Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling.
-+\-Xlocator
-+Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling.
- .TP 3
--\-Xsync\-methods
--Causes all of the generated method signatures to include the \f2synchronized\fP keyword.
-+\-Xsync\-methods
-+Causes all of the generated method signatures to include the \f2synchronized\fP keyword.
- .TP 3
--\-mark\-generated
--Mark the generated code with the annotation \f2@javax.annotation.Generated\fP.
-+\-mark\-generated
-+Mark the generated code with the annotation \f2@javax.annotation.Generated\fP.
- .TP 3
--\-episode <file>
--Generate the specified episode file for separate compilation.
-+\-episode <file>
-+Generate the specified episode file for separate compilation.
- .RE
-
- .LP
--.SS
-+.SS
- Deprecated and Removed Command Line Options
- .LP
- .RS 3
- .TP 3
--\-host & \-port
--These options have been deprecated and replaced with the \f3\-httpproxy\fP option. For backwards compatibility, we will continue to support these options, but they will no longer be documented and may be removed from future releases.
-+\-host & \-port
-+These options have been deprecated and replaced with the \f3\-httpproxy\fP option. For backwards compatibility, we will continue to support these options, but they will no longer be documented and may be removed from future releases.
- .TP 3
--\-use\-runtime
--Since the JAXB 2.0 specification has defined a portable runtime, it is no longer necessary for the JAXB RI to generate **/impl/runtime packages. Therefore, this switch is obsolete and has been removed.
-+\-use\-runtime
-+Since the JAXB 2.0 specification has defined a portable runtime, it is no longer necessary for the JAXB RI to generate **/impl/runtime packages. Therefore, this switch is obsolete and has been removed.
- .TP 3
--\-source
--The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase.
-+\-source
-+The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase.
- .RE
-
- .LP
--.SS
-+.SS
- Compiler Restrictions
- .LP
- .LP
-@@ -244,30 +244,30 @@
- .RS 3
- .TP 2
- o
--To compile multiple schemas at the same time, keep the following precedence rules for the target Java package name in mind:
-+To compile multiple schemas at the same time, keep the following precedence rules for the target Java package name in mind:
- .RS 3
- .TP 3
- 1.
--The "\f2\-p\fP" command line option takes the highest precedence.
-+The "\f2\-p\fP" command line option takes the highest precedence.
- .TP 3
- 2.
--<\f2jaxb:package\fP> customization
-+<\f2jaxb:package\fP> customization
- .TP 3
- 3.
--If \f2targetNamespace\fP is declared, apply \f2targetNamespace\fP \-> Java package name algorithm defined in the specification.
-+If \f2targetNamespace\fP is declared, apply \f2targetNamespace\fP \-> Java package name algorithm defined in the specification.
- .TP 3
- 4.
--If no \f2targetNamespace\fP is declared, use a hardcoded package named "generated".
-+If no \f2targetNamespace\fP is declared, use a hardcoded package named "generated".
- .RE
- .TP 2
- o
--It is not legal to have more than one <\f2jaxb:schemaBindings\fP> per namespace, so it is impossible to have two schemas in the same target namespace compiled into different Java packages.
-+It is not legal to have more than one <\f2jaxb:schemaBindings\fP> per namespace, so it is impossible to have two schemas in the same target namespace compiled into different Java packages.
- .TP 2
- o
--All schemas being compiled into the same Java package must be submitted to the XJC binding compiler at the same time \- they cannot be compiled independently and work as expected.
-+All schemas being compiled into the same Java package must be submitted to the XJC binding compiler at the same time \- they cannot be compiled independently and work as expected.
- .TP 2
- o
--Element substitution groups spread across multiple schema files must be compiled at the same time.
-+Element substitution groups spread across multiple schema files must be compiled at the same time.
- .RE
-
- .LP
-@@ -280,18 +280,18 @@
- .na
- \f2command\-line instructions\fP @
- .fi
--https://jaxb.dev.java.net/nonav/2.1.3/docs/xjc.html,
-+https://jaxb.dev.java.net/nonav/2.1.3/docs/xjc.html,
- .na
- \f2using the XJC Ant task\fP @
- .fi
--https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html]
-+https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html]
- .TP 2
- o
- .na
- \f2Java Architecture for XML Binding (JAXB)\fP @
- .fi
--http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
- .RE
-
- .LP
--
-+
---- jdk/src/linux/doc/man/ja/jarsigner.1 2013-09-06 11:27:46.000000000 -0700
-+++ jdk/src/linux/doc/man/ja/jarsigner.1 2014-01-18 12:16:22.000000000 -0800
-@@ -1,1673 +1,1403 @@
--." 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
--." under the terms of the GNU General Public License version 2 only, as
--." published by the Free Software Foundation.
--."
--." This code is distributed in the hope that it will be useful, but WITHOUT
--." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--." version 2 for more details (a copy is included in the LICENSE file that
--." accompanied this code).
--."
--." You should have received a copy of the GNU General Public License version
--." 2 along with this work; if not, write to the Free Software Foundation,
--." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--."
--." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--." or visit www.oracle.com if you need additional information or have any
--." questions.
--."
--.TH jarsigner 1 "05 Jul 2012"
--
--.LP
--.SH "̾Á°"
--jarsigner \- JAR½ð̾¤ª¤è¤Ó¸¡¾Ú¥Ä¡¼¥ë
--.LP
--.LP
--Java ARchive(JAR)¥Õ¥¡¥¤¥ë¤Î½ð̾¤òÀ¸À®¤·¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
--.LP
-+'\" t
-+.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-+.\" Title: jarsigner
-+.\" Language: English
-+.\" Date: 2013ǯ8·î6Æü
-+.\" SectDesc: ¥»¥­¥å¥ê¥Æ¥£¡¦¥Ä¡¼¥ë
-+.\" Software: JDK 7
-+.\" Arch: ÈÆÍÑ
-+.\"
-+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+.\"
-+.\" This code is free software; you can redistribute it and/or modify it
-+.\" under the terms of the GNU General Public License version 2 only, as
-+.\" published by the Free Software Foundation.
-+.\"
-+.\" This code is distributed in the hope that it will be useful, but WITHOUT
-+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+.\" version 2 for more details (a copy is included in the LICENSE file that
-+.\" accompanied this code).
-+.\"
-+.\" You should have received a copy of the GNU General Public License version
-+.\" 2 along with this work; if not, write to the Free Software Foundation,
-+.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+.\"
-+.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+.\" or visit www.oracle.com if you need additional information or have any
-+.\" questions.
-+.\"
-+.pl 99999
-+.TH "jarsigner" "1" "2013ǯ8·î6Æü" "JDK 7" "¥»¥­¥å¥ê¥Æ¥£¡¦¥Ä¡¼¥ë"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+.SH "NAME"
-+jarsigner \- Java¥¢¡¼¥«¥¤¥Ö(JAR)¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ½ð̾¤ª¤è¤Ó¸¡¾Ú¤ò¹Ô¤¤¤Þ¤¹¡£
- .SH "·Á¼°"
--.LP
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
--\fP\f3jarsigner\fP [ options ] jar\-file alias
--.fl
--\f3jarsigner\fP \-verify [ options ] jar\-file [alias...]
--.fl
--.fi
--
--.LP
--.LP
--jarsigner¤Î\-verify¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢jarsigner¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\-keystore¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
--.LP
-+\fIjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\fIjarsigner\fR \fI\-verify\fR [ \fIoptions\fR ] \fIjar\-file\fR [\fIalias \&.\&.\&.\fR]
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fIoptions\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verify
-+.RS 4
-+\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\fI\-keystore\fR¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤷ¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤ê½ÅÂç¤Ê·Ù¹ð¤¬¸¡½Ð¤µ¤ì¤ë¤È¡¢¥á¥Ã¥»¡¼¥¸¡Öjar¤¬¸¡¾Ú¤µ¤ì¤Þ¤·¤¿¡£½ð̾¼Ô¥¨¥é¡¼¡×¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\fIjar\-file\fR
-+.RS 4
-+½ð̾¤µ¤ì¤ëJAR¥Õ¥¡¥¤¥ë¡£
-+.RE
-+.PP
-+\fIalias\fR
-+.RS 4
-+ÊÌ̾¤Ï¡¢\fI\-keystore\fR¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
-+.RE
- .SH "ÀâÌÀ"
--.LP
--.LP
--\f3jarsigner\fP¥Ä¡¼¥ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÌÜŪ¤Ç»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 3
--1.
--Java ARchive(JAR)¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëÌÜŪ
--.TP 3
--2.
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ
--.RE
--
--.LP
--.LP
--JARµ¡Ç½¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¥¤¥á¡¼¥¸¡¢¥µ¥¦¥ó¥É¤ª¤è¤Ó¤½¤Î¾¤Î¥Ç¥¸¥¿¥ë¡¦¥Ç¡¼¥¿¤òñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥±¡¼¥¸²½¤Ç¤­¤ë¤Î¤Ç¡¢¥Õ¥¡¥¤¥ë¤ò¿×®¤«¤ÄÍưפËÇÛÉۤǤ­¤Þ¤¹¡£³«È¯¼Ô¤Ï¡¢jar(1)¤È¤¤¤¦Ì¾Á°¤Î¥Ä¡¼¥ë¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£(µ»½ÑŪ¤Ê´ÑÅÀ¤«¤é¸À¤¨¤Ð¡¢¤¹¤Ù¤Æ¤ÎZIP¥Õ¥¡¥¤¥ë¤âJAR¥Õ¥¡¥¤¥ë¤È¤ß¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢\f3jar\fP¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï\f3jarsigner\fP¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢META\-INF/MANIFEST.MF¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£)
--.LP
--.LP
--\f2¥Ç¥¸¥¿¥ë½ð̾\fP¤Ï¡¢¤Ê¤ó¤é¤«¤Î¥Ç¡¼¥¿(¡Ö½ð̾¡×¤ÎÂоݤȤʤë¥Ç¡¼¥¿)¤È¡¢¥¨¥ó¥Æ¥£¥Æ¥£(¿Í¡¢²ñ¼Ò¤Ê¤É)¤ÎÈëÌ©¸°¤È¤Ë´ð¤Å¤¤¤Æ·×»»¤µ¤ì¤ë¥Ó¥Ã¥ÈÎó¤Ç¤¹¡£¼ê½ñ¤­¤Î½ð̾ƱÍÍ¡¢¥Ç¥¸¥¿¥ë½ð̾¤Ë¤Ï¿¤¯¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--½ð̾¤ÎÀ¸À®¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ÈÂФˤʤë¸ø³«¸°¤ò»ÈÍѤ·¤Æ·×»»¤ò¹Ô¤¦¤³¤È¤Ç¡¢¥Ç¥¸¥¿¥ë½ð̾¤¬ËÜʪ¤«¤É¤¦¤«¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--ÈëÌ©¸°¤¬Â¾¿Í¤ËÃΤé¤ì¤Ê¤¤¸Â¤ê¡¢¥Ç¥¸¥¿¥ë½ð̾¤Îµ¶Â¤¤ÏÉÔ²Äǽ¤Ç¤¹¡£
--.TP 2
--o
--¥Ç¥¸¥¿¥ë½ð̾¤Ï¡¢¤½¤Î½ð̾¤¬ÉÕ¤¤¤¿¥Ç¡¼¥¿¤Î¤ß¤òÂоݤȤ¹¤ë¤â¤Î¤Ç¤¢¤ê¡¢Â¾¤Î¥Ç¡¼¥¿¤Î½ð̾¤È¤·¤Æµ¡Ç½¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
--.TP 2
--o
--½ð̾ÉÕ¤­¤Î¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î½ð̾¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤¬ËÜʪ¤Ç¤Ï¤Ê¤¤¤³¤È¤¬¸¡¾Ú¤µ¤ì¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥¨¥ó¥Æ¥£¥Æ¥£¤Î½ð̾¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´ØÏ¢¤¹¤ë¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¸ø³«¸°¤òǧ¾Ú¤¹¤ë1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¾ÚÌÀ½ñ¤âɬÍפǤ¹¡£\f2¾ÚÌÀ½ñ\fP¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤¬È¯¹Ô¤·¤¿¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Ç¡¢Ê̤ʥ¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤¬ÆÃÄê¤ÎÃͤǤ¢¤ë¤³¤È¤ò¾ÚÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¡¢\f2¥­¡¼¥¹¥È¥¢\fP¤Ë´Þ¤Þ¤ì¤ë¸°¤È¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤Æ¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¡¢ÈëÌ©¸°¡¢¤ª¤è¤ÓÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¤¿¤á¤ÎX.509¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬¼ý¤á¤é¤ì¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢¤ÎºîÀ®¤È´ÉÍý¤Ë¤Ï¡¢keytool(1)¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤ËÂФ¹¤ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ÚÌÀ½ñ¤Î¥³¥Ô¡¼¤Ê¤É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\f3jarsigner\fP¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ëÆâ(½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ëÆâ)¤Ë¤¢¤ë¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¤½¤Î¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤à½ð̾¤òÀ¸À®¤¹¤ë¤Î¤Ç¡¢¥·¥¹¥Æ¥à¤ä¥Ç¥×¥í¥¤¥ä(Java Plug\-in¤ò´Þ¤à)¤ÏJAR¥Õ¥¡¥¤¥ë¤¬½ð̾¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´ÖÃæ¤Ë½ð̾¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢API¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é¥¿¥¤¥à¥¹¥¿¥ó¥×¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¸½»þÅÀ¤Ç¤Ï¡¢\f3jarsigner\fP¤Ç½ð̾¤Ç¤­¤ë¤Î¤Ï¡¢SDK¤Îjar(1)¥Ä¡¼¥ë¤ÇºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Î¤ß¤Ç¤¹¡£(JAR¥Õ¥¡¥¤¥ë¤ÏZIP¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢JAR¥Õ¥¡¥¤¥ë¤Ë¤ÏMETA\-INF/MANIFEST.MF¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢\f3jarsigner\fP¤¬ZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ë¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£)
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f3jarsigner\fP¤ÏJAR(¤Þ¤¿¤ÏZIP)¥Õ¥¡¥¤¥ë¤Ë\f2½ð̾¤·¤Þ¤¹\fP¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò\f2¸¡¾Ú\fP¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-verify\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤Ï¡¢°ì°Õ¤Î\f2ÊÌ̾\fP¤ò²ð¤·¤Æ¥¢¥¯¥»¥¹¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®¤ËɬÍפÊÈëÌ©¸°¤ò´Þ¤à¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤ÎÎã¤Ï¡¢working¥Ç¥£¥ì¥¯¥È¥ê¤Îmystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë´Þ¤Þ¤ì¤ëÊÌ̾duke¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢MyJARFile.jar¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢MyJARFile.jar¤Ï½ð̾ÉÕ¤­¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢ÈëÌ©¸°¤â¥­¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤Î¾ì½ê
--.LP
--.LP
--\f3jarsigner\fP¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥­¡¼¥¹¥È¥¢¤ÎURL¤ò»ØÄꤹ¤ë\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\f2user.home\fP¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·è¤Þ¤ë¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î\f2.keystore\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£Solaris¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢\f2user.home\fP¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¥æ¡¼¥¶¡¼¤Îhome¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Ï¡¢\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£URL¤È¤·¤Æ\f2NONE\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢null¤Î¥¹¥È¥ê¡¼¥à¤¬\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£\f2NONE\fP¤Ï¡¢\f2KeyStore\fP¤¬¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¤¿¤È¤¨¤Ð¡¢¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¡¦¥Ç¥Ð¥¤¥¹¾å¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¤Ê¤É¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ
--.LP
--.LP
--\f2java.security\fP¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë\f2KeyStore\fP¥¯¥é¥¹¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤ª¤è¤Ó¾ðÊó¤ÎÊѹ¹¤ò¹Ô¤¦¤¿¤á¤Î¡¢ÌÀ³Î¤ËÄêµÁ¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¸ÇÄê¼ÂÁõ¤È¤·¤Æ¤Ï¡¢¤½¤ì¤¾¤ì¤¬ÆÃÄê¤Î\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤òÂоݤȤ¹¤ëÊ£¿ô¤Î°Û¤Ê¤ë¼ÂÁõ¤¬Â¸ºß²Äǽ¤Ç¤¹¡£
--.LP
--.LP
--¸½ºß¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤â¤Î¤È¤·¤Æ¡¢\f3keytool\fP¤È\f3jarsigner\fP¤Î2¤Ä¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë¤È¡¢\f3Policy Tool\fP¤È¤¤¤¦Ì¾Á°¤Î1¤Ä¤ÎGUI¥Ù¡¼¥¹¤Î¥Ä¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£\f2KeyStore\fP¤Ï¸ø³«¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Java 2 SDK¥æ¡¼¥¶¡¼¤ÏKeyStore¤ò»ÈÍѤ¹¤ë¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âºîÀ®¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Ë¤Ï¡¢Sun Microsystems¤¬Ä󶡤¹¤ëÁȹþ¤ß¤Î¥Ç¥Õ¥©¥ë¥È¤Î¼ÂÁõ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢JKS¤È¤¤¤¦Ì¾Á°¤ÎÆȼ«¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(·Á¼°)¤òÍøÍѤ¹¤ë¤â¤Î¤Ç¡¢¥­¡¼¥¹¥È¥¢¤ò¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¼ÂÁõ¤Ç¤Ï¡¢¸Ä¡¹¤ÎÈëÌ©¸°¤Ï¸ÄÊ̤Υѥ¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÀ°¹çÀ­¤â(ÈëÌ©¸°¤È¤ÏÊ̤Î)¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ï¡¢¥×¥í¥Ð¥¤¥À¥Ù¡¼¥¹¤Ç¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢\f2KeyStore\fP¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬¡Ö¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡×(SPI)¤Ë´ð¤Å¤¤¤Æ¼ÂÁõ¤µ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢Âбþ¤¹¤ë\f2KeystoreSpi\fPÃê¾Ý¥¯¥é¥¹(¤³¤ì¤â\f2java.security\fP¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹)¤¬¤¢¤ê¡¢¤³¤Î¥¯¥é¥¹¤¬¡¢¡Ö¥×¥í¥Ð¥¤¥À¡×¤¬¼ÂÁõ¤¹¤ëɬÍפΤ¢¤ëService Provider Interface¤Î¥á¥½¥Ã¥É¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£(¤³¤³¤Ç¡¢¡Ö¥×¥í¥Ð¥¤¥À¡×¤È¤Ï¡¢Java Security API¤Ë¤è¤Ã¤Æ¥¢¥¯¥»¥¹²Äǽ¤Ê¥µ¡¼¥Ó¥¹¤Î¥µ¥Ö¥»¥Ã¥È¤ËÂФ·¡¢¤½¤Î¸ÇÄê¼ÂÁõ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î½¸¹ç¤Î¤³¤È¤Ç¤¹¡£)¤·¤¿¤¬¤Ã¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¤Ë¤Ï¡¢
--.na
--\f2Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍÑ¥×¥í¥Ð¥¤¥À¤Î¼ÂÁõÊýË¡\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬¡Ö¥×¥í¥Ð¥¤¥À¡×¤ò¼ÂÁõ¤·¡¢KeystoreSpi¥µ¥Ö¥¯¥é¥¹¤Î¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢\f2KeyStore\fP¥¯¥é¥¹¤¬Ä󶡤¹¤ëgetInstance¥Õ¥¡¥¯¥È¥ê¡¦¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢ÍÍ¡¹¤Ê¥×¥í¥Ð¥¤¥À¤«¤é°Û¤Ê¤ë\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Ï¡¢¥­¡¼¥¹¥È¥¢¾ðÊó¤Î³ÊǼ·Á¼°¤È¥Ç¡¼¥¿·Á¼°¤òÄêµÁ¤¹¤ë¤È¤È¤â¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÈëÌ©¸°¤È¥­¡¼¥¹¥È¥¢¼«ÂΤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤·¤Þ¤¹¡£°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ë¤Ï¡¢¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
--.LP
--.LP
--\f3keytool\fP¤Ï¡¢Ç¤°Õ¤Î¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢¼ÂÁõ¤ÇÆ°ºî¤·¤Þ¤¹¡£(¤³¤ì¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éÅϤµ¤ì¤¿¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ°·¤¤¡¢¤³¤ì¤òFileInputStream¤ËÊÑ´¹¤·¤Æ¡¢FileInputStream¤«¤é¥­¡¼¥¹¥È¥¢¤Î¾ðÊó¤ò¥í¡¼¥É¤·¤Þ¤¹¡£)°ìÊý¡¢\f3jarsigner\fP¥Ä¡¼¥ë¤È\f3policytool\fP¥Ä¡¼¥ë¤Ï¡¢URL¤Ç»ØÄê²Äǽ¤ÊǤ°Õ¤Î¾ì½ê¤«¤é¥­¡¼¥¹¥È¥¢¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤È\f3keytool\fP¤Î¾ì¹ç¡¢\f2\-storetype\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f3Policy Tool\fP¤Î¾ì¹ç¤Ï¡¢¡ÖEdit¡×¥á¥Ë¥å¡¼¤Î¡ÖChange Keystore¡×¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¥æ¡¼¥¶¡¼¤¬¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢Ã±½ã¤Ë¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ˴ð¤Å¤¤¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ï\f2java.security\fP¤È¸Æ¤Ð¤ì¡¢SDK¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\f2java.home\fP/lib/securityÆâ¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢\f2java.home\fP¤Ï¼Â¹Ô»þ´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê(SDK¤Î\f2jre\fP¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤ÏJava 2 Runtime Environment¤Î¥È¥Ã¥×¥ì¥Ù¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê)¤Ç¤¹¡£
--.LP
--.LP
--³Æ¥Ä¡¼¥ë¤Ï¡¢\f2keystore.type\fP¤ÎÃͤò¼èÆÀ¤·¡¢¤³¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥Ð¥¤¥À¤òÄ´¤Ù¤Þ¤¹¡£ÌÜŪ¤Î¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥×¥í¥Ð¥¤¥À¤«¤é¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.LP
--\f2KeyStore\fP¥¯¥é¥¹¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤ëstatic¥á¥½¥Ã¥É\f2getDefaultType\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ä¥¢¥×¥ì¥Ã¥È¤«¤é\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥³¡¼¥É¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤Ç»ØÄꤵ¤ì¤¿¥¿¥¤¥×)¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ïjks(Sun¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- keystore.type=jks
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Ãí°Õ: ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢JKS¤Èjks¤ÏƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.LP
--.LP
--³Æ¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢pkcs12¤È¸Æ¤Ð¤ì¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- keystore.type=pkcs12
--.fl
--\fP
--.fi
--
--.LP
--.LP
--PKCS#11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Î¾ÜºÙ¤Ï¡¢Java PKCS#11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Ë¤¢¤ë
--.na
--\f2KeyTool¤ÈJarSigner\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à
--.LP
--.LP
--\f3jarsigner\fP¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¼¡¤Î¤¤¤º¤ì¤«¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--SHA1¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿DSA(¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à)
--.TP 2
--o
--SHA256¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿RSA¥¢¥ë¥´¥ê¥º¥à
--.TP 2
--o
--SHA256¤ÈECDSA(Âʱ߶ÊÀþ¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à)¤ò»ÈÍѤ·¤¿EC(Âʱ߶ÊÀþ)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
--.RE
--
--.LP
--.LP
--¶ñÂÎŪ¤Ë¤Ï¡¢½ð̾¼Ô¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤¬DSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA1withDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬RSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA256withRSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬EC¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA256withECDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£
--.LP
--.LP
--¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£
--.LP
--.SS
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë
--.LP
--.LP
--\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤¿¾ì¹ç¡¢½ÐÎϤµ¤ì¤ë½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÏÆþÎÏJAR¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢¼¡¤Î2¤Ä¤ÎÄɲåե¡¥¤¥ë¤¬META\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--.SF³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Õ¥¡¥¤¥ë
--.TP 2
--o
--.DSA¡¢.RSA¤Þ¤¿¤Ï.EC¤ò³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
--.RE
--
--.LP
--.LP
--¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\f2\-sigFile\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¤È¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
--\-sigFile MKSIGN
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¤³¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤Ï¤½¤ì¤¾¤ìMKSIGN.SF¤ÈMKSIGN.DSA¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-sigfile\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ(_)¤ËÃÖ¤­´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£»ÈÍѤǤ­¤ëʸ»ú¤Ï¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ(_)¡¢¥Ï¥¤¥Õ¥ó¤Ç¤¹¡£
--.LP
--\f3½ð̾(.SF)¥Õ¥¡¥¤¥ë\fP
--.LP
--.LP
--½ð̾¥Õ¥¡¥¤¥ë(.SF¥Õ¥¡¥¤¥ë)¤Ï¡¢\f3jarsigner\fP¤Ç½ð̾¤òÉÕ¤±¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¾ï¤Ë´Þ¤Þ¤ì¤ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤È»÷¤Æ¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëƱÍÍ¡¢.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë¡¢¼¡¤Î3¤Ä¤Î¹Ô¤¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--¥Õ¥¡¥¤¥ë̾
--.TP 2
--o
--»ÈÍѤµ¤ì¤Æ¤¤¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à(SHA)¤Î̾Á°
--.TP 2
--o
--SHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
--.RE
--
--.LP
--.LP
--¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎSHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¡¦¥Ç¡¼¥¿¤Î¥À¥¤¥¸¥§¥¹¥È(¥Ï¥Ã¥·¥å)¤Ë¤Ê¤ê¤Þ¤¹¡£°ìÊý¡¢.SF¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¤³¤ì¤é3¹Ô¤Î¥Ï¥Ã¥·¥å¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--½ð̾¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ÇÀâÌÀ¤¹¤ë¤è¤¦¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤Î¸ºß¤Ë¤è¤Ã¤Æ¸¡¾Ú¤ÎºÇŬ²½¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
--.LP
--\f3½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë\fP
--.LP
--.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï½ð̾¤¬ÉÕ¤±¤é¤ì¡¢½ð̾¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤âÉä¹æ²½¤µ¤ì¤¿·Á¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ï¡¢½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤·¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ï¡¢»ÈÍѤµ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Ë±þ¤¸¤Æ.DSA¡¢.RSA¡¢.EC¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
--.SS
--½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×
--.LP
--.LP
--\f2jarsigner\fP¥Ä¡¼¥ë¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤·¤ÆÊݸ¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f2jarsigner\fP¤ÏÂåÂؽð̾µ¡¹½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤Ï¾Êά²Äǽ¤Ç¡¢½ð̾»þ¤Ë¼¡¤Î³Æ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--\f2\-tsa url\fP
--.TP 2
--o
--\f2\-tsacert alias\fP
--.TP 2
--o
--\f2\-altsigner class\fP
--.TP 2
--o
--\f2\-altsignerpath classpathlist\fP
--.RE
--
--.LP
--.LP
--¤³¤ì¤é¤Î³Æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¸å¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 3
--1.
--.SF¥Õ¥¡¥¤¥ë¼«ÂΤνð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
--.br
--.br
--¤³¤Î¼ê½ç¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(.DSA)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë½ð̾¤¬¡¢¼ÂºÝ¤Ë¡¢¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£.DSA¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¸ø³«¸°¤Î¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤Î¼ê½ç¤Ç¤Ï¡¢ÌÜŪ¤Î½ð̾¤¬¡¢Âбþ¤¹¤ë½ð̾(.SF)¥Õ¥¡¥¤¥ëÆâ¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¡¢.SF¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
--.TP 3
--2.
--.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Î¥À¥¤¥¸¥§¥¹¥È¤ò¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
--.br
--.br
--.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¼ÂºÝ¤Ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¼ê½ç¤Ë¸¡¾Ú¤¬¿Ê¤ß¤Þ¤¹¡£
--.br
--.br
--¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤¿¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹(½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£
--.br
-+.PP
-+\fIjarsigner\fR¥Ä¡¼¥ë¤Ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÌÜŪ¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+Java¥¢¡¼¥«¥¤¥Ö(JAR)¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëÌÜŪ¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ¡£
-+.RE
-+.PP
-+JARµ¡Ç½¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¥¤¥á¡¼¥¸¡¢¥µ¥¦¥ó¥É¤ª¤è¤Ó¤½¤Î¾¤Î¥Ç¥¸¥¿¥ë¡¦¥Ç¡¼¥¿¤òñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥±¡¼¥¸²½¤Ç¤­¤ë¤Î¤Ç¡¢¥Õ¥¡¥¤¥ë¤ò¿×®¤«¤ÄÍưפËÇÛÉۤǤ­¤Þ¤¹¡£\fIjar\fR¤È¤¤¤¦Ì¾Á°¤Î¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¡¢³«È¯¼Ô¤ÏJAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£(µ»½ÑŪ¤Ê´ÑÅÀ¤«¤é¸À¤¨¤Ð¡¢¤¹¤Ù¤Æ¤ÎZIP¥Õ¥¡¥¤¥ë¤âJAR¥Õ¥¡¥¤¥ë¤È¤ß¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢jar¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï\fIjarsigner\fR¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£)
-+.PP
-+¥Ç¥¸¥¿¥ë½ð̾¤Ï¡¢¤Ê¤ó¤é¤«¤Î¥Ç¡¼¥¿(½ð̾¤ÎÂоݤȤʤë¥Ç¡¼¥¿)¡¢¤ª¤è¤Ó¥¨¥ó¥Æ¥£¥Æ¥£(¿Í¡¢²ñ¼Ò¤Ê¤É)¤ÎÈëÌ©¸°¤«¤é·×»»¤µ¤ì¤ë¥Ó¥Ã¥È¤Îʸ»úÎó¤Ç¤¹¡£¼ê½ñ¤­¤Î½ð̾ƱÍÍ¡¢¥Ç¥¸¥¿¥ë½ð̾¤Ë¤Ï¿¤¯¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾¤ÎÀ¸À®¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤ò»ÈÍѤ¹¤ë·×»»¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤¬ËÜʪ¤Ç¤¢¤ë¤³¤È¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+ÈëÌ©¸°¤¬Â¾¿Í¤ËÃΤé¤ì¤Ê¤¤¸Â¤ê¡¢¥Ç¥¸¥¿¥ë½ð̾¤Îµ¶Â¤¤ÏÉÔ²Äǽ¤Ç¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¤³¤ì¤Ï¡¢½ð̾¤¬ÉÕ¤¤¤¿¥Ç¡¼¥¿¤Îµ¡Ç½¤Ç¤¢¤ê¡¢Â¾¤Î¥Ç¡¼¥¿¤Î½ð̾¤È¤Ê¤ë¤è¤¦¤ËÍ×µá¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾ÉÕ¤­¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¡¢½ð̾¤Ë¤è¤Ã¤ÆËÜʪ¤Ç¤¢¤ë¤È¸¡¾Ú¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.PP
-+¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥¨¥ó¥Æ¥£¥Æ¥£¤Î½ð̾¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´ØÏ¢¤¹¤ë¸ø³«¸°/ÈëÌ©¸°¤Î¥Ú¥¢¤È¡¢¸ø³«¸°¤òǧ¾Ú¤¹¤ë1¤Ä°Ê¾å¤Î¾ÚÌÀ½ñ¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÚÌÀ½ñ¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤«¤é¤Î¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Ç¡¢Ê̤Υ¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤¬ÆÃÄê¤ÎÃͤò»ý¤Ä¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢¥­¡¼¥¹¥È¥¢¤«¤é¤Î¸°¤È¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤Æ¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¡¢ÈëÌ©¸°¡¢¤ª¤è¤ÓÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¡¢ÈëÌ©¸°¤Ë´ØÏ¢¤·¤¿X\&.509¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¤¹¡£\fIkeytool\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢¤òºîÀ®¤ª¤è¤Ó´ÉÍý¤·¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢Æäˡ¢¥Õ¥¡¥¤¥ë¤Ø¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤Î¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Î¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢ÆâÉô(½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ëÆâ)¤Î¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢½ð̾¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´ÖÃæ¤ËJAR¥Õ¥¡¥¤¥ë¤¬½ð̾¤µ¤ì¤¿¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥·¥¹¥Æ¥à¤ä¥Ç¥×¥í¥¤¥ä(Java Plug\-in¤ò´Þ¤à)¤¬¥Á¥§¥Ã¥¯¤Ç¤­¤ë¡¢¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤à½ð̾¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢API¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¥¿¥¤¥à¥¹¥¿¥ó¥×¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£
-+.PP
-+¸½»þÅÀ¤Ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjar\fR¥³¥Þ¥ó¥É¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Î¤ß¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤ÏZIP¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤â´Þ¤Þ¤ì¤Æ¤¤¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤ÆZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëºÝ¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Î\fIjarsigner\fR¥³¥Þ¥ó¥É¤ÎÆ°ºî¤Ç¤Ï¡¢JAR¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¸å¤Ë½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤Î¸¡¾Ú¤â»î¹Ô¤·¤Þ¤¹¡£¸¡¾Ú¥¨¥é¡¼¤Þ¤¿¤Ï¤½¤Î¾¤ÎÌäÂ꤬ȯÀ¸¤¹¤ë¤È¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê½ÅÂç¤Ê·Ù¹ð¤¬¥¨¥é¡¼¤È¤·¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£¥¨¥é¡¼¤È·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾"
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢°ì°Õ¤ÎÊÌ̾¤ò»ÈÍѤ·¤Æ¥¢¥¯¥»¥¹¤µ¤ì¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®¤ËɬÍפÊÈëÌ©¸°¤ò´Þ¤à¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIworking\fR¥Ç¥£¥ì¥¯¥È¥ê¤Î\fImystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë´Þ¤Þ¤ì¤ëÊÌ̾\fIduke\fR¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢\fIMyJARFile\&.jar\fR¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢\fIMyJARFile\&.jar\fR¤Ï½ð̾ÉÕ¤­¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-storepass <keystore password>
-+ \-keypass <private key password> MyJARFile\&.jar duke
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢ÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢ÈëÌ©¸°¤â¥­¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤ÈƱ¤¸¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤Î¾ì½ê"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥­¡¼¥¹¥È¥¢¤ÎURL¤ò»ØÄꤹ¤ë\fI\-keystore\fR¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\fIuser\&.home\fR¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·è¤Þ¤ë¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î\fI\&.keystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£Oracle Solaris¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢\fIuser\&.home\fR¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ç¥Õ¥©¥ë¥ÈÀßÄꤵ¤ì¤Þ¤¹¡£
-+.PP
-+\fI\-keystore\fR¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Ï¡¢\fIKeyStore\&.load\fR¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£URL¤È¤·¤Æ\fINONE\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢null¤Î¥¹¥È¥ê¡¼¥à¤¬\fIKeyStore\&.load\fR¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£\fINONE\fR¤Ï¡¢\fIKeyStore\fR¥¯¥é¥¹¤¬¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¤¿¤È¤¨¤Ð¡¢¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¡¦¥Ç¥Ð¥¤¥¹¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë»ØÄꤷ¤Þ¤¹¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ"
-+.PP
-+\fIjava\&.security package\fR¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë\fIKeyStore\fR¥¯¥é¥¹¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤ª¤è¤Ó¾ðÊó¤ÎÊѹ¹¤ò¹Ô¤¦¤¿¤á¤Î¡¢ÌÀ³Î¤ËÄêµÁ¤µ¤ì¤¿Â¿¤¯¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£Ê£¿ô¤Î°Û¤Ê¤ë¸ÇÄê¼ÂÁõ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¡¢³Æ¼ÂÁõ¤ÏÆÃÄê¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤òÂоݤȤ·¤Þ¤¹¡£
-+.PP
-+¸½ºß¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë2¤Ä¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë(\fIkeytool\fR¤È\fIjarsigner\fR)¡¢¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Ä¡¼¥ë¤È¤¤¤¦Ì¾Á°¤Î1¤Ä¤ÎGUI¥Ù¡¼¥¹¤Î¥Ä¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£\fIKeyStore\fR¥¯¥é¥¹¤Ï¸ø³«¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢JDK¥æ¡¼¥¶¡¼¤Ï¡¢¤½¤ì¤ò»ÈÍѤ¹¤ë¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.PP
-+Oracle¤¬Ä󶡤¹¤ëÁȹþ¤ß¤Î¥Ç¥Õ¥©¥ë¥È¤Î¼ÂÁõ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢KS¤È¤¤¤¦Ì¾Á°¤ÎÆȼ«¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(·Á¼°)¤ò»ÈÍѤ¹¤ë¤â¤Î¤Ç¡¢¥­¡¼¥¹¥È¥¢¤ò¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£Áȹþ¤ß¤Î¼ÂÁõ¤Ç¤Ï¡¢³ÆÈëÌ©¸°¤Ï¸ÄÊ̤Υѥ¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÀ°¹çÀ­¤Ï(ÈëÌ©¸°¤È¤ÏÊ̤Î)¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ï¥×¥í¥Ð¥¤¥À¥Ù¡¼¥¹¤Ç¡¢¤Ä¤Þ¤ê¡¢\fIKeyStore\fR¥¯¥é¥¹¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹(SPI)¤Ë´Ø¤·¤Æ¼ÂÁõ¤µ¤ì¤Þ¤¹¡£Âбþ¤¹¤ë\fIKeystoreSpi\fRÃê¾Ý¥¯¥é¥¹¤¬¤¢¤ê¡¢¤³¤ì¤â\fIjava\&.security package\fR¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¤¬¡¢¥×¥í¥Ð¥¤¥À¤¬¼ÂÁõ¤¹¤ëɬÍפΤ¢¤ë¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢¥×¥í¥Ð¥¤¥À¤È¤Ï¡¢Java Security API¤Ë¤è¤Ã¤Æ¥¢¥¯¥»¥¹²Äǽ¤Ê¥µ¡¼¥Ó¥¹¤Î¥µ¥Ö¥»¥Ã¥È¤ËÂФ·¡¢¤½¤Î¸ÇÄê¼ÂÁõ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î½¸¹ç¤Î¤³¤È¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¤Ë¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider\&.html¤Ë¤¢¤ë
-+Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¥×¥í¥Ð¥¤¥À¤Î¼ÂÁõÊýË¡¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¥×¥í¥Ð¥¤¥À¤ò¼ÂÁõ¤·¡¢\fIKeystoreSpi\fR¥µ¥Ö¥¯¥é¥¹¤Î¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.PP
-+¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢\fIKeyStore\fR¥¯¥é¥¹¤Î\fIgetInstance\fR¥Õ¥¡¥¯¥È¥ê¡¦¥á¥½¥Ã¥É¤ò»ÈÍѤ·¤Æ¡¢ÍÍ¡¹¤Ê¥×¥í¥Ð¥¤¥À¤«¤é°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Ï¡¢¥­¡¼¥¹¥È¥¢¾ðÊó¤Î³ÊǼ·Á¼°¤È¥Ç¡¼¥¿·Á¼°¤òÄêµÁ¤¹¤ë¤È¤È¤â¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÈëÌ©¸°¤È¥­¡¼¥¹¥È¥¢¼«ÂΤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤·¤Þ¤¹¡£°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ë¤Ï¡¢¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-+.PP
-+\fIkeytool\fR¥³¥Þ¥ó¥É¤Ï¡¢Ç¤°Õ¤Î¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢¼ÂÁõ¤ÇÆ°ºî¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÅϤµ¤ì¤¿¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ°·¤¤¡¢¤³¤ì¤ò\fIFileInputStream\fR¤ËÊÑ´¹¤·¤Æ¡¢¤½¤³¤«¤é¥­¡¼¥¹¥È¥¢¤Î¾ðÊó¤ò¥í¡¼¥É¤·¤Þ¤¹¡£\fIjarsigner\fR¥Ä¡¼¥ë¤ª¤è¤Ó\fIpolicytool\fR¥Ä¡¼¥ë¤Ï¡¢URL¤ò»ÈÍѤ·¤Æ»ØÄê²Äǽ¤ÊǤ°Õ¤Î¾ì½ê¤«¤é¥­¡¼¥¹¥È¥¢¤òÆɤ߼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ª¤è¤Ó\fIkeytool\fR¥³¥Þ¥ó¥É¤Î¾ì¹ç¡¢\fI\-storetype\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Ý¥ê¥·¡¼¡¦¥Ä¡¼¥ë¤Î¾ì¹ç¡¢¡ÖÊÔ½¸¡×¥á¥Ë¥å¡¼¤ÎChange Keystore¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-+.PP
-+¥æ¡¼¥¶¡¼¤¬¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿\fIkeystore\&.type\fR¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ˴ð¤Å¤¤¤Æ¡¢¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ï\fIjava\&.security\fR¤È¸Æ¤Ð¤ì¡¢JDK¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\fIjava\&.home/lib/security\fRÆâ¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢java\&.home¤Ï¼Â¹Ô»þ´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£\fIjre\fR¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢JDK¤Þ¤¿¤ÏJava Runtime Environment (JRE)¤ÎºÇ¾å°Ì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£
-+.PP
-+³Æ¥Ä¡¼¥ë¤Ï¡¢\fIkeystore\&.type\fR¤ÎÃͤò¼èÆÀ¤·¡¢¤½¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥Ð¥¤¥À¤òÄ´¤Ù¤Þ¤¹¡£ÌÜŪ¤Î¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥×¥í¥Ð¥¤¥À¤«¤é¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.PP
-+\fIKeyStore\fR¥¯¥é¥¹¤Ç¤Ï¡¢\fIgetDefaultType\fR¤È¤¤¤¦Ì¾Á°¤Îstatic¥á¥½¥Ã¥É¤òÄêµÁ¤·¡¢¤³¤ì¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ª¤è¤Ó¥¢¥×¥ì¥Ã¥È¤«¤é\fIkeystore\&.type property\fR¤ÎÃͤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥³¡¼¥É¤Î¹Ô¤Ç¤Ï¡¢\fIkeystore\&.type property\fR¤Ç»ØÄꤵ¤ì¤¿¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òºîÀ®¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+KeyStore keyStore = KeyStore\&.getInstance(KeyStore\&.getDefaultType());
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢\fIjks\fR
-+(Oracle¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+keystore\&.type=jks
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\fIJKS\fR¤Ï\fIjks\fR¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¤½¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\fIpkcs12\fR¤È¸Æ¤Ð¤ì¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¾ì¹ç¡¢¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+keystore\&.type=pkcs12
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fBÃí°Õ: \fRPKCS 11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/p11guide\&.html¤Ë¤¢¤ë
-+Java PKCS #11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖKeyTool¡×¤ª¤è¤Ó¡ÖJarSigner¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.SS "¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à"
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¼¡¤Î¤¤¤º¤ì¤«¤Î¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA1¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à(DSA)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA256¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿RSA¥¢¥ë¥´¥ê¥º¥à¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA256¤ÈÂʱ߶ÊÀþ¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à(ECDSA)¤ò»ÈÍѤ·¤¿Âʱ߶ÊÀþ(EC)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
-+.RE
-+.PP
-+½ð̾¼Ô¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤¬DSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA¤ÈDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬RSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA256¤ÈRSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤è¤¦¤È¤·¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬EC¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA256¤ÈECDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
-+.PP
-+¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\fI\-sigalg\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£
-+.SS "½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¡¢½ÐÎϤµ¤ì¤ë½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÏÆþÎÏJAR¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢¼¡¤Î2¤Ä¤ÎÄɲåե¡¥¤¥ë¤¬META\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\&.SF\fR³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Õ¥¡¥¤¥ë
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\&.DSA\fR¡¢\fI\&.RSA\fR¤Þ¤¿¤Ï\fI\&.EC\fR³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
-+.RE
-+.PP
-+¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fI\-sigFile\fR¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥ª¥×¥·¥ç¥ó¤¬\fI\-sigFile MKSIGN\fR¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë¤Ï\fIMKSIGN\&.SF\fR¤ª¤è¤Ó\fIMKSIGN\&.DSA\fR¤È¤¤¤¦Ì¾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sigfile\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ç»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤ÎºîÀ®»þ¤Ë¡¢³ºÅö¤¹¤ëʸ»ú¤¬²¼Àþ(_)ʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Í­¸ú¤Êʸ»ú¤Ï¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤Ç¤¹¡£
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB½ð̾¥Õ¥¡¥¤¥ë\fR
-+.RS 4
-+.PP
-+½ð̾¥Õ¥¡¥¤¥ë(\fI\&.SF\fR¥Õ¥¡¥¤¥ë)¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëºÝ¤ËJAR¥Õ¥¡¥¤¥ë¤Ë¾ï¤Ë´Þ¤Þ¤ì¤ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤È»÷¤Æ¤¤¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤è¤¦¤Ê¡¢¼¡¤Ë¼¨¤¹3¤Ä¤Î¹Ô¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥Õ¥¡¥¤¥ë̾
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à(SHA)¤Î̾Á°
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
-+.RE
-+.PP
-+¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎSHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¡¦¥Ç¡¼¥¿¤Î¥À¥¤¥¸¥§¥¹¥È(¥Ï¥Ã¥·¥å)¤Ë¤Ê¤ê¤Þ¤¹¡£\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¤½¤Î3¹Ô¤Î¥Ï¥Ã¥·¥å¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+½ð̾¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¤È¡¢¸¡¾Ú¤ÎºÇŬ²½¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë\fR
-+.RS 4
-+.PP
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï½ð̾¤¬ÉÕ¤±¤é¤ì¡¢½ð̾¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤â¡¢ÆâÉô¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ï¡¢»ÈÍѤµ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Ë±þ¤¸¤Æ¡¢\fI\&.DSA\fR¡¢\fI\&.RSA\fR¤Þ¤¿¤Ï\fI\&.EC\fR¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.RE
-+.SS "½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤ª¤è¤ÓÊݸ¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢\fIjarsigner\fR¤ÏÂåÂؽð̾µ¡¹½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤Ï¾Êά²Äǽ¤Ç¡¢½ð̾»þ¤Ë¼¡¤Î³Æ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-tsa \fIurl\fR
-+\-tsacert \fIalias\fR
-+\-altsigner \fIclass\fR
-+\-altsignerpath \fIclasspathlist\fR
-+\-tsapolicyid \fIpolicyid\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú"
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¹ß¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 1.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 1." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(\fI\&.DSA\fR)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤¿½ð̾¤¬¡¢¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë¼¨¤µ¤ì¤ë¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤³¤È¤ò³Îǧ¤·¤Þ¤¹¡£¤Þ¤¿¡¢½ð̾¤¬Âбþ¤¹¤ë½ð̾(\fI\&.SF\fR)¥Õ¥¡¥¤¥ë¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¡¢¤½¤ì¤Ë¤è¤ê¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤¬²þ¤¶¤ó¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 2.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 2." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Ë¼¨¤µ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¤ò¡¢¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
-+.sp
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£
-+.sp
-+°ìÃפ·¤Ê¤¤¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¡¢¤¢¤Þ¤êºÇŬ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£½ð̾¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤¬¡¢¸½ºß¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ë°ìÃפ·¤Ê¤¤Íýͳ¤Î1¤Ä¤Ï¡¢½ð̾¤ª¤è¤Ó\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¸å¤Ë¡¢(\fIjar\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ë¤ËÄɲ䵤줿¤³¤È¤Ç¤¹¡£\fIjar\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤ë¤³¤È¤Ë¤è¤ê¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹¤¬¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¸¡¾Ú¤¬¤Þ¤ÀÀ®¸ù¤·¤Æ¤¤¤ë¤È¤ß¤Ê¤µ¤ì¤ë¤Î¤Ï¡¢½ð̾¤ÎÀ¸À®°Ê¹ß¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£¤³¤ì¤¬È¯À¸¤¹¤ë¤Î¤Ï¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¾ì¹ç¤Ç¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 3.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 3." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤ÄJAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߼è¤ê¤Þ¤¹¡£Æɼè¤êÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¥×¥í¥»¥¹Ãæ¤Ë¤Ê¤ó¤é¤«¤Î½ÅÂç¤Ê¸¡¾Ú¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¤½¤Î¥×¥í¥»¥¹¤ÏÄä»ß¤µ¤ì¡¢¥»¥­¥å¥ê¥Æ¥£Îã³°¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢Îã³°¤òÊ᪤ª¤è¤Óɽ¼¨¤·¤Þ¤¹¡£
-+.RE
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
- .br
--.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¡¢¼ÂºÝ¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢½ð̾(¤Ä¤Þ¤ê.SF¥Õ¥¡¥¤¥ë)¤ÎÀ¸À®¸å¤Ë¡¢JAR¥Õ¥¡¥¤¥ë¤Ë1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬(\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)Äɲ䵤줿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹(¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤¹)¤¬¡¢.SF¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Ë³ÊǼ¤µ¤ì¤¿¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®»þ¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¸ºß¤·¤Æ¤¤¤¿¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ë¤Ê¤ê¡¢¸¡¾Ú¤ÏÀ®¸ù¤·¤¿¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.TP 3
--3.
--JAR¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤Ä³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£Æɹþ¤ßÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î³ºÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£2¤Ä¤Î¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¸¡¾Ú¥×¥í¥»¥¹¤ÎÅÓÃæ¤Ç¤Ê¤ó¤é¤«¤Î½ÅÂç¤Ê¸¡¾Ú¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¸¡¾Ú¥×¥í¥»¥¹¤ÏÃæ»ß¤µ¤ì¡¢¥»¥­¥å¥ê¥Æ¥£Îã³°¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£Îã³°¤Ï¡¢\f3jarsigner\fP¤¬¥­¥ã¥Ã¥Á¤·¤Æɽ¼¨¤·¤Þ¤¹¡£
--.LP
--.SS
--1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤òÂоݤȤ¹¤ëÊ£¿ô¤Î½ð̾
--.LP
--.LP
--1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ\f3jarsigner\fP¥Ä¡¼¥ë¤òÊ£¿ô²ó¼Â¹Ô¤·¡¢¼Â¹Ô¤Î¤¿¤Ó¤Ë¡¢°Û¤Ê¤ë¥æ¡¼¥¶¡¼¤ÎÊÌ̾¤ò»ØÄꤹ¤ì¤Ð¡¢JAR¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î¥æ¡¼¥¶¡¼¤Î½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner myBundle.jar susan
--.fl
-- jarsigner myBundle.jar kevin
--.fl
--\fP
--.fi
--
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤¬Ê£¿ô²ó½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ú¥¢¤¬Ê£¿ô´Þ¤Þ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ú¥¢¤Ï¡¢1²ó¤Î½ð̾¤ËÂФ·¤Æ1¤ÄºîÀ®¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¾å¤ÎÎã¤Ç½ÐÎϤµ¤ì¤ëJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î̾Á°¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- SUSAN.SF
--.fl
-- SUSAN.DSA
--.fl
-- KEVIN.SF
--.fl
-- KEVIN.DSA
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Ãí°Õ: JAR¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢JDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤ÇÀ¸À®¤µ¤ì¤¿½ð̾¤È\f3jarsigner\fP¤ÇÀ¸À®¤µ¤ì¤¿½ð̾¤¬º®ºß¤Ç¤­¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤¹¤Ç¤Ë\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë¡¢\f3jarsigner\fP¤ò»ÈÍѤ·¤Æ½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+Äɲäηٹð(¤Þ¤¿¤Ï¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¥¨¥é¡¼)¤Ï¤¹¤Ù¤ÆÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£Æ±Íͤˡ¢¾ÚÌÀ¤¬¿®Íê¤Ç¤­¤ë¤«¤ò·èÄꤹ¤ë¤¿¤á¤Ë¡¢(\fI\-verbose\fR¤ª¤è¤Ó\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ)¾ÚÌÀ½ñ¤ÎÆâÍƤâÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.SS "1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤òÂоݤȤ¹¤ëÊ£¿ô¤Î½ð̾"
-+.PP
-+¼¡¤Î¤è¤¦¤Ë¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò¥Õ¥¡¥¤¥ë¤ÇÊ£¿ô²ó¼Â¹Ô¤·¡¢¼Â¹Ô¤Î¤¿¤Ó¤Ë°Û¤Ê¤ë¥æ¡¼¥¶¡¼¤ÎÊÌ̾¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î¥æ¡¼¥¶¡¼¤Î½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner myBundle\&.jar susan
-+jarsigner myBundle\&.jar kevin
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤¬Ê£¿ô²ó½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢Ê£¿ô¤Î\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢1²ó¤Î½ð̾¤ËÂФ·¤Æ1¤Ä¤Î¥Ú¥¢¤È¤Ê¤ê¤Þ¤¹¡£Á°½Ò¤ÎÎã¤Ç¤Ï¡¢½ÐÎÏJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î̾Á°¤Î¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+SUSAN\&.SF
-+SUSAN\&.DSA
-+KEVIN\&.SF
-+KEVIN\&.DSA
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fBÃí°Õ: \fRJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JDK 1\&.1¤Î\fIjavakey\fR¥³¥Þ¥ó¥É¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤È¡¢\fIjarsigner\fR¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç¤¹¤Ç¤Ë½ð̾¤µ¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
- .SH "¥ª¥×¥·¥ç¥ó"
--.LP
--.LP
--¼¡¤Ë¡¢\f3jarsigner\fP¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£Ãí°Õ:
--.LP
--.RS 3
--.TP 2
--o
--¤É¤Î¥ª¥×¥·¥ç¥ó̾¤Ë¤âÀèƬ¤Ë¥Þ¥¤¥Ê¥¹µ­¹æ(\-)¤¬ÉÕ¤­¤Þ¤¹¡£
--.TP 2
--o
--¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤμºݤÎÃÍ(¥ª¥×¥·¥ç¥ó¤ÎÃÍ)¤Ï¡¢»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 2
--o
--\f2\-keystore\fP¡¢\f2\-storepass\fP¡¢\f2\-keypass\fP¡¢\f2\-sigfile\fP¡¢\f2\-sigalg\fP¡¢\f2\-digestalg\fP¤ª¤è¤Ó\f2\-signedjar\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤǤ­¤ë¤Î¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¾ì¹ç¤Ç¤Ï¤Ê¤¯¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£Æ±Íͤˡ¢ÊÌ̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£
--.RE
--
--.LP
--.RS 3
--.TP 3
--\-keystore url
--¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\f2.keystore\fP¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢user.home¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£
--.br
--.br
--½ð̾¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤¬É¬ÍפǤ¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç(¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç)¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.br
--.br
--¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤Ï\f2ɬÍפ¢¤ê¤Þ¤»¤ó\fP¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
--.br
--.br
--Ãí°Õ: \f2\-keystore\fP¤Î°ú¿ô¤Ë¤Ï¡¢URL¤Î¤«¤ï¤ê¤Ë¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¡Öfile:¡×URL¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.PP
-+¼¡¤Î³Æ¹à¤Ç¤Ï¡¢ÍÍ¡¹¤Ê\fIjarsigner\fR¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£¼¡¤Îɸ½à¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¤É¤Î¥ª¥×¥·¥ç¥ó̾¤Ë¤âÀèƬ¤Ë¥Þ¥¤¥Ê¥¹µ­¹æ(\-)¤¬ÉÕ¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤμºݤÎÃÍ(¥ª¥×¥·¥ç¥ó¤ÎÃÍ)¤Ï¡¢»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\-keystore\fR¡¢\fI\-storepass\fR¡¢\fI\-keypass\fR¡¢\fI\-sigfile\fR¡¢\fI\-sigalg\fR¡¢\fI\-digestalg\fR¤ª¤è¤Ó\fI\-signedjar\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤǤ­¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú»þ¤Ë¤Ï¡¢¤³¤ì¤é¤Ï´Ø·¸¤¢¤ê¤Þ¤»¤ó¡£Æ±Íͤˡ¢ÊÌ̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ø¤Î½ð̾»þ¤Î¤ß¤Ç¤¹¡£
-+.RE
-+.PP
-+\-keystore \fIurl\fR
-+.RS 4
-+¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢\fIuser\&.home\fR¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·èÄꤵ¤ì¤¿¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\fI\&.keystore\fR¤Ë¥Ç¥Õ¥©¥ë¥ÈÀßÄꤵ¤ì¤Þ¤¹¡£
-+.sp
-+¥­¡¼¥¹¥È¥¢¤Ï½ð̾»þ¤Ë¤ÏɬÍפǤ¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-keystore\fR°ú¿ô¤Ë¤Ï¡¢URL¤Ç¤Ï¤Ê¤¯¥Õ¥¡¥¤¥ë̾¤È¥Ñ¥¹¤ò»ØÄê¤Ç¤­¡¢¤³¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë: URL¤ÈƱ¤¸¤è¤¦¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Ë¤è¤¦¤Ë»ØÄꤹ¤ë¤ÈƱÅù¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
-- \-keystore \fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--¤³¤ì¤Ï¡¢¼¡¤Î»ØÄê¤ÈƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- \-keystore file:\fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--JRE¤Î\f2$JAVA_HOME/lib/security\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤¿\f2java.security\fP¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS#11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢keytool¤Èjarsigner¤ÏPKCS#11¥È¡¼¥¯¥ó¤Ë´ð¤Å¤¤¤ÆÆ°ºî¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2\-keystore NONE\fP
--.TP 2
--o
--\f2\-storetype PKCS11\fP
--.RE
--¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢¹½À®¤µ¤ì¤¿PKCS#11¥È¡¼¥¯¥ó¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- jarsigner \-keystore NONE \-storetype PKCS11 \-list
--.fl
--\fP
--.fi
--.TP 3
--\-storetype storetype
--¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Îkeystore.type¥×¥í¥Ñ¥Æ¥£¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Ç¤¹¡£¤³¤ÎÃͤϡ¢\f2java.security.KeyStore\fP¤Îstatic \f2getDefaultType\fP¥á¥½¥Ã¥É¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆPCKS#11¥È¡¼¥¯¥ó¤ÎPIN¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£²¿¤â»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢keytool¤Èjarsigner¤Ï¥æ¡¼¥¶¡¼¤Ë¥È¡¼¥¯¥óPIN¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£¥È¡¼¥¯¥ó¤ËÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹(ÀìÍѤÎPIN¥Ñ¥Ã¥É¤äÀ¸ÂÎÆɼè¤êµ¡¤Ê¤É)¤¬¤¢¤ë¾ì¹ç¡¢\f2\-protected\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¡¦¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
--.TP 3
--\-storepass[:env | :file] argument
--¥­¡¼¥¹¥È¥¢¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤ËɬÍפʥѥ¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤¬É¬ÍפʤΤϡ¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Î¤ß¤Ç¤¹(¸¡¾Ú¤¹¤ë¤È¤­¤Ë¤ÏÉÔÍפǤ¹)¡£¤½¤Î¾ì¹ç¡¢\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.br
--.br
--½¤¾þ»Ò\f2env\fP¤Þ¤¿¤Ï\f2file\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\f2argument\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2env\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.TP 2
--o
--\f2file\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.RE
--Ãí°Õ: ¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
--.TP 3
--\-keypass[:env | :file] argument
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ËÂбþ¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤òÊݸ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤¬»ØÄꤵ¤ì¤Æ¤ª¤é¤º¡¢É¬Íפʥѥ¹¥ï¡¼¥É¤¬¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.br
--.br
--½¤¾þ»Ò\f2env\fP¤Þ¤¿¤Ï\f2file\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\f2argument\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2env\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.TP 2
--o
--\f2file\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.RE
--Ãí°Õ: ¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
--.TP 3
--\-sigfile file
--.SF¥Õ¥¡¥¤¥ë¤È .DSA¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2file\fP¤ËDUKESIGN¤ò»ØÄꤹ¤ë¤È¡¢À¸À®¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢¤½¤ì¤¾¤ìDUKESIGN.SF¤ÈDUKESIGN.DSA¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÎMETA\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£
--.br
--.br
--\f2file\fP¤Ë»ÈÍѤǤ­¤ëʸ»ú¤Ï¡Öa\-zA\-Z0\-9_\-¡×¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢Ê¸»ú¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤Î¤ß¤ò»ÈÍѤǤ­¤Þ¤¹¡£Ãí°Õ: .SF¤ª¤è¤Ó.DSA¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-sigfile\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ(_)¤ËÃÖ¤­´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-sigalg algorithm
-+\-keystore \fIfilePathAndName\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-keystore file:\fIfilePathAndName\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+(JRE¤Î\fI$JAVA_HOME/lib/security directory\fR¤Ë¤¢¤ë)
-+\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS #11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤¿¾ì¹ç¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤ÏPKCS#11¥È¡¼¥¯¥ó¤Ë´ð¤Å¤¤¤ÆÆ°ºî¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-keystore NONE
-+\-storetype PKCS11
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢¹½À®¤µ¤ì¤¿PKCS#11¥È¡¼¥¯¥ó¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \-list
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-storetype \fIstoretype\fR
-+.RS 4
-+¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î\fIkeystore\&.type\fR¥×¥í¥Ñ¥Æ¥£¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Ç¡¢¤³¤ÎÃͤϡ¢\fIjava\&.security\&.KeyStore\fR¤Îstatic
-+\fIgetDefaultType\fR¥á¥½¥Ã¥É¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-storepass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢PCKS #11¥È¡¼¥¯¥ó¤ÎPIN¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£²¿¤â»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢¥È¡¼¥¯¥óPIN¤Î»ØÄê¤òµá¤á¤é¤ì¤Þ¤¹¡£¥È¡¼¥¯¥ó¤ËÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹(ÀìÍѤÎPIN¥Ñ¥Ã¥É¤äÀ¸ÂÎÆɼè¤êµ¡¤Ê¤É)¤¬¤¢¤ë¾ì¹ç¡¢\fI\-protected\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¡¦¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.PP
-+\-storepass[:env | :file} \fIargument\fR
-+.RS 4
-+¥­¡¼¥¹¥È¥¢¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤ËɬÍפʥѥ¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤¬É¬ÍפʤΤϡ¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Î¤ß¤Ç¤¹(¸¡¾Ú¤¹¤ë¤È¤­¤Ë¤ÏÉÔÍפǤ¹)¡£¤½¤Î¾ì¹ç¡¢\fI\-storepass\fR¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.sp
-+½¤¾þ»Ò\fIenv\fR¤Þ¤¿¤Ï\fIfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\fIargument\fR¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIenv\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIfile\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+\fBÃí°Õ:\fR¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-keypass [:env | :file] \fIargument\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ËÂбþ¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤òÊݸ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£\fIjarsigner\fR¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤¬»ØÄꤵ¤ì¤Æ¤ª¤é¤º¡¢É¬Íפʥѥ¹¥ï¡¼¥É¤¬¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.sp
-+½¤¾þ»Ò\fIenv\fR¤Þ¤¿¤Ï\fIfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\fIargument\fR¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIenv\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIfile\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+\fBÃí°Õ: \fR¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-sigfile \fIfile\fR
-+.RS 4
-+À¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë»ÈÍѤ¹¤ë¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Õ¥¡¥¤¥ë¤¬\fIDUKESIGN\fR¤Î¾ì¹ç¡¢À¸À®¤µ¤ì¤ë\fI\&.SF\fR¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ï¡¢\fIDUKESIGN\&.SF\fR¤ª¤è¤Ó\fIDUKESIGN\&.DSA\fR¤È¤¤¤¦Ì¾Á°¤Ç¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î\fIMETA\-INF\fR¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+¥Õ¥¡¥¤¥ëÆâ¤Îʸ»ú¤Ï¡¢¥»¥Ã¥È\fIa\-zA\-Z0\-9_\-\fR¤«¤é»ØÄꤵ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥óʸ»ú¤Î¤ß¤ò»ÈÍѤǤ­¤Þ¤¹¡£\fI\&.SF\fR¤ª¤è¤Ó\fI\&.DSA\fR¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-+.sp
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sigfile\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ç̵¸ú¤Êʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¡¢³ºÅö¤¹¤ëʸ»ú¤¬²¼Àþ(_)ʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-sigalg \fIalgorithm\fR
-+.RS 4
- JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--ɸ½à½ð̾¥¢¥ë¥´¥ê¥º¥à̾¤Î°ìÍ÷¤Ï¡¢Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î
--.na
--\f2ÉÕÏ¿A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤È¤Î¸ß´¹À­¤¬É¬ÍפǤ¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ÈëÌ©¸°¤Î¥¿¥¤¥×¤Ë±þ¤¸¤ÆSHA1withDSA¡¢SHA256withRSA¡¢SHA256withECDSA¤Î¤¤¤º¤ì¤«¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\f2\-providerClass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.TP 3
--\-digestalg algorithm
-+.sp
-+ɸ½àŪ¤Ê½ð̾¥¢¥ë¥´¥ê¥º¥à̾¤Î¥ê¥¹¥È¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA¤Ë¤¢¤ë
-+Java Cryptography Architecture (JCA)¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖÉÕÏ¿A: ɸ½à̾¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤È¤Î¸ß´¹À­¤¬É¬ÍפǤ¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢ÈëÌ©¸°¤Î¥¿¥¤¥×¤Ë±þ¤¸¤Æ¡¢\fISHA1withDSA\fR¡¢\fISHA256withRSA\fR¤Þ¤¿¤Ï\fISHA256withECDSA\fR¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\fI\-providerClass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-digestalg \fIalgorithm\fR
-+.RS 4
- JAR¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê¤ò¥À¥¤¥¸¥§¥¹¥È¤¹¤ëºÝ¤Ë»ÈÍѤ¹¤ë¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à̾¤Î°ìÍ÷¤Ï¡¢Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î
--.na
--\f2ÉÕÏ¿A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢SHA256¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\f2\-providerClass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.TP 3
--\-signedjar file
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç̾Á°¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë(½ð̾¤ÎÂоݤȤʤëJAR¥Õ¥¡¥¤¥ë)¤Î̾Á°¤ÈƱ¤¸Ì¾Á°¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-verify
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢»ØÄꤵ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ç¤Ï¤Ê¤¯¸¡¾Ú¤¬¹Ô¤ï¤ì¤Þ¤¹¡£¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢¡Öjar¤¬¸¡¾Ú¤µ¤ì¤Þ¤·¤¿¡£¡×¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥¢¥ë¥´¥ê¥º¥à(RSA¥×¥í¥Ð¥¤¥À¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò½ªÎ»¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤ÎRSA¤Ê¤É)¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤è¤¦¤È¤¹¤ë¤È¡¢¡Öjar¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£(½ð̾¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¹½Ê¸²òÀϤǤ­¤Þ¤»¤ó)¡×¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ï¡¢\f3jarsigner\fP¤Þ¤¿¤ÏJDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤Î¤É¤Á¤é¤«¤Þ¤¿¤ÏξÊý¤ò»ÈÍѤ·¤Æ¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.br
--.br
--¸¡¾Ú¤Î¾ÜºÙ¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-certs
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\f2\-verify\fP¤ª¤è¤Ó\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¼¡¤Î¤â¤Î¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--½ð̾¼Ô¤Î¸ø³«¸°¤ò¾ÚÌÀ¤¹¤ë(.DSA¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤¿)¾ÚÌÀ½ñ¥¿¥¤¥×¤Î̾Á°
--.TP 2
--o
--¾ÚÌÀ½ñ¤¬X.509¾ÚÌÀ½ñ(¤Ä¤Þ¤ê¡¢\f2java.security.cert.X509Certificate\fP¤Î¥¤¥ó¥¹¥¿¥ó¥¹)¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢½ð̾¼Ô¤Î¼±ÊÌ̾
--.RE
--¥­¡¼¥¹¥È¥¢¤Î³Îǧ¤â¹Ô¤ï¤ì¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤ÎÃͤ¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ì¤Ð¡¢¸¡ºº¤µ¤ì¤Þ¤¹¡£½ð̾¼Ô¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢Æâ¤Î¥¨¥ó¥È¥ê¤È°ìÃפ·¤¿¾ì¹ç¤Ï¡¢¼¡¤Î¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--½ð̾¼Ô¤Ë³ºÅö¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¡£¤³¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËͳÍ褹¤ë½ð̾¼Ô¤Î¾ì¹ç¤Ï¡¢³ç¸Ì¤Ç¤Ï¤Ê¤¯Âç³ç¸Ì¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£
--.RE
--.TP 3
--\-certchain file
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿ÊÌ̾¤Ç·è¤Þ¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬´°Á´¤Ç¤Ê¤¤¾ì¹ç¤Ë¡¢»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¾õÂ֤ˤʤë²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ï¡¢¥­¡¼¥¹¥È¥¢¤¬¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¾å¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¤¬¡¢¤½¤³¤Ë¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÎÁ´ÂΤòÊÝ»ý¤Ç¤­¤ëÎΰ褬¸ºß¤·¤Æ¤¤¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ç¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï°ìÏ¢¤ÎX.509¾ÚÌÀ½ñ¤¬½ç¤ËÏ¢·ë¤µ¤ì¤¿¤â¤Î¡¢PKCS#7·Á¼°¤Îñ°ì¥Ç¡¼¥¿¡¦¥Ö¥í¥Ã¥¯¤Î¤¤¤º¤ì¤«¤È¤Ê¤ê¡¢¤½¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¤Ï¥Ð¥¤¥Ê¥ê¡¦¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¡¢Internet RFC 1421ɸ½à¤Çµ¬Äꤵ¤ì¤ë°õºþ²Äǽ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°(BASE64¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤â¸Æ¤Ð¤ì¤ë)¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
--.TP 3
--\-verbose
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f3jarsigner\fP¤Ï¡Ö¾éĹ¡×¥â¡¼¥É¤ÇÆ°ºî¤·¡¢JAR¤Î½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¿Ê¹Ô¾õ¶·¤Ë´Ø¤¹¤ëÄɲþðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
--.TP 3
--\-internalsf
--°ÊÁ°¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤¿.DSA(½ð̾¥Ö¥í¥Ã¥¯)¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¡¢À¸À®¤µ¤ì¤¿.SF¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Î´°Á´¤Ê¥³¥Ô¡¼¤¬Éä¹æ²½¤µ¤ì¤¿·Á¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ÎÆ°ºî¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£¸½ºß¤Ç¤Ï¡¢½ÐÎÏJAR¥Õ¥¡¥¤¥ëÁ´ÂΤΥµ¥¤¥º¤ò¾®¤µ¤¯¤¹¤ë¤¿¤á¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï.SF¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤¬.DSA¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¿¤À¤·¡¢\f2\-internalsf\fP¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤È¡¢°ÊÁ°¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤Ë¤ÏÊØÍø¤Ç¤¹¤¬¡¢¤½¤ì°Ê³°¤Ë¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Í­±×¤ÊºÇŬ²½¤¬¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\fP
--.TP 3
--\-sectionsonly
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤ò´Þ¤à¥Ø¥Ã¥À¡¼¤Ï\f2´Þ¤Þ¤ì¤Þ¤»¤ó\fP¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë´Ø¤¹¤ë¾ðÊ󤪤è¤Ó¥Ï¥Ã¥·¥å¤Î¤ß¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ºÇŬ²½¤Î¤¿¤á¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤¬Äɲ䵤ì¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú»þ¤Ë¡¢¤Þ¤º¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤È¼ÂºÝ¤Ë°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤Æ¸¡¾Ú¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--¾ÜºÙ¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤Ë¤ÏÊØÍø¤Ç¤¹¤¬¡¢¤½¤ì°Ê³°¤Ë¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Í­±×¤ÊºÇŬ²½¤¬¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\fP
--.TP 3
--\-protected
--\f2true\fP¤Þ¤¿¤Ï\f2false\fP¤Î¤¤¤º¤ì¤«¡£ÀìÍÑPIN¥ê¡¼¥À¡¼¤Ê¤É¤ÎÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹¤ò²ð¤·¤Æ¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÃͤË\f2true\fP¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-providerClass provider\-class\-name
--¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤¬¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë(\f2java.security\fP)¤Î¥ê¥¹¥È¤ËÆþ¤Ã¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¡¢°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤Î¥Þ¥¹¥¿¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£
--.br
--.br
--\f2\-providerArg\fP \f2ConfigFilePath\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£keytool¤Èjarsigner¤Ï¥×¥í¥Ð¥¤¥À¤òưŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹(¤³¤³¤Ç¡¢\f2ConfigFilePath\fP¤Ï¥È¡¼¥¯¥ó¹½À®¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ç¤¹)¡£¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS#11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ËPKCS#11¥­¡¼¥¹¥È¥¢¤ò°ìÍ÷ɽ¼¨¤¹¤ë¥³¥Þ¥ó¥É¤ÎÎã¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerClass sun.security.pkcs11.SunPKCS11 \\
--.fl
-- \-providerArg /foo/bar/token.config \\
--.fl
-+.sp
-+ɸ½àŪ¤Ê¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à̾¤Î¥ê¥¹¥È¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA¤Ë¤¢¤ë
-+Java Cryptography Architecture (JCA)¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖÉÕÏ¿A: ɸ½à̾¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\fISHA256\fR¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\fI\-providerClass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-certs
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò\fI\-verify\fR¤ª¤è¤Ó\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¡¢½ð̾¼Ô¤Î¸ø³«¸°¤ò¾ÚÌÀ¤¹¤ë¾ÚÌÀ½ñ(\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ)¤Î¥¿¥¤¥×¤Î̾Á°¤¬´Þ¤Þ¤ì¡¢¾ÚÌÀ½ñ¤¬X\&.509¾ÚÌÀ½ñ(\fIjava\&.security\&.cert\&.X509Certificate\fR¤Î¥¤¥ó¥¹¥¿¥ó¥¹)¤Î¾ì¹ç¡¢½ð̾¼Ô¤Î¼±ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-+.sp
-+¥­¡¼¥¹¥È¥¢¤Î³Îǧ¤â¹Ô¤ï¤ì¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤ÎÃͤ¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë(¤¢¤ë¾ì¹ç)¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤¹¡£½ð̾¼Ô¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢Æâ¤Î¥¨¥ó¥È¥ê¤È°ìÃפ¹¤ë¾ì¹ç¡¢¤½¤Î½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢¤Î¥¨¥ó¥È¥ê¤ÎÊÌ̾¤¬´Ý¥«¥Ã¥³Æâ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1\&.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËͳÍ褹¤ë½ð̾¼Ô¤Î¾ì¹ç¡¢ÊÌ̾¤Ï´Ý¥«¥Ã¥³¤Ç¤Ï¤Ê¤¯Â祫¥Ã¥³Æâ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-certchain \fIfile\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿ÊÌ̾¤Ë¤è¤Ã¤Æɽ¤µ¤ì¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬´°Á´¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ë¡¢»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥óÁ´ÂΤòÊÝ»ý¤¹¤ë¤Î¤Ë½½Ê¬¤ÊÎΰ褬¤Ê¤¤¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¾å¤Ë¥­¡¼¥¹¥È¥¢¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤ËȯÀ¸¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï°ìÏ¢¤ÎÏ¢·ë¤µ¤ì¤¿X\&.509¾ÚÌÀ½ñ¡¢PKCS#7·Á¼°¤Îñ°ì¥Ç¡¼¥¿¡¦¥Ö¥í¥Ã¥¯¤Î¤¤¤º¤ì¤«¤È¤Ê¤ê¡¢¤½¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¤Ï¥Ð¥¤¥Ê¥ê¡¦¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¡¢Internet RFC 1421ɸ½à¤Çµ¬Äꤵ¤ì¤ë°õºþ²Äǽ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°(Base64¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤â¸Æ¤Ð¤ì¤ë)¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verbose
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¾éĹ¥â¡¼¥É¤ÇÆ°ºî¤·¡¢¤³¤Î¥â¡¼¥É¤Ç¤Ï¡¢\fIjarsigner\fR¤Ï¡¢JAR¤Î½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¿Ê¹Ô¾õ¶·¤Ë´Ø¤¹¤ëÄɲþðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-internalsf
-+.RS 4
-+°ÊÁ°¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤¿\fI\&.DSA\fR
-+(½ð̾¥Ö¥í¥Ã¥¯)¥Õ¥¡¥¤¥ë¤Ë¡¢À¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Î¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿´°Á´¤Ê¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤·¤¿¡£ ¤³¤ÎÆ°ºî¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£½ÐÎÏJAR¥Õ¥¡¥¤¥ëÁ´ÂΤΥµ¥¤¥º¤ò¾®¤µ¤¯¤¹¤ë¤¿¤á¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-internalsf\fR¤ò»ØÄꤷ¤¿¾ì¹ç¡¢°ÊÁ°¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¼ÂºÝ¤Ë¤Ï¡¢\fI\-internalsf\fR¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤¬Â礭¤¯¤Ê¤ë¤¿¤á¡¢»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-sectionsonly
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sectionsonly\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤ë\fI\&.SF\fR¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤ò´Þ¤à¥Ø¥Ã¥À¡¼¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë´Þ¤Þ¤ì¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë´ØÏ¢¤¹¤ë¾ðÊ󤪤è¤Ó¥Ï¥Ã¥·¥å¤Î¤ß¤Ç¤¹¡£½ð̾¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ºÇŬ²½¤Î¤¿¤á¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤¬Äɲ䵤ì¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¤¿¤Ó¤Ë¡¢¸¡¾Ú¤Ç¤Ï¡¢¤Þ¤º¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£°ìÃפ·¤Ê¤¤¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤¤¤¦¡¢¤¢¤Þ¤êºÇŬ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¸¡¾Ú¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+\fI\-sectionsonly\fR¥ª¥×¥·¥ç¥ó¤Ï¡¢¼ç¤Ë¥Æ¥¹¥ÈÍѤ˻ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤ò»ÈÍѤ¹¤ë¤È¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤¬Â礭¤¯¤Ê¤ë¤¿¤á¡¢¥Æ¥¹¥ÈÍѰʳ°¤Ç¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-protected
-+.RS 4
-+\fItrue\fR¤Þ¤¿¤Ï\fIfalse\fR¤Î¤¤¤º¤ì¤«¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£ÀìÍÑPIN¥ê¡¼¥À¡¼¤Ê¤É¤ÎÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹¤Ë¤è¤Ã¤Æ¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¢\fItrue\fR¤ò»ØÄꤷ¤Þ¤¹¡£
-+.RE
-+.PP
-+\-providerClass \fIprovider\-class\-name\fR
-+.RS 4
-+°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤¬\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢¤½¤Î¥Þ¥¹¥¿¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-providerArg \fR\fIConfigFilePath\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ·¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤Ï¡¢¥×¥í¥Ð¥¤¥À¤òưŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢¥È¡¼¥¯¥ó¹½À®¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ë\fIConfigFilePath\fR¤ò»ÈÍѤ·¤Þ¤¹¡£¼¡¤ÎÎã¤Ï¡¢Oracle PKCS #11¥×¥í¥Ð¥¤¥À¤¬¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë\fIPKCS #11\fR¥­¡¼¥¹¥È¥¢¤ò°ìÍ÷ɽ¼¨¤¹¤ë¥³¥Þ¥ó¥É¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \e
-+ \-providerClass sun\&.security\&.pkcs11\&.SunPKCS11 \e
-+ \-providerArg /mydir1/mydir2/token\&.config \e
- \-list
--.fl
--\fP
- .fi
--.TP 3
--\-providerName providerName
--\f2java.security\fP¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Ç2¤Ä°Ê¾å¤Î¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2\-providerName\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÆÃÄê¤Î¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î̾Á°¤Ç¤¹¡£
--.br
--.br
--Sun PKCS#11¥×¥í¥Ð¥¤¥À¤Î¾ì¹ç¡¢\f2providerName\fP¤Ï\f2SunPKCS11\-\fP\f2TokenName\fP¤È¤¤¤¦·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤³¤Ç\f2TokenName\fP¤Ï¡¢¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤¬¹½À®¤µ¤ì¤¿Ì¾Á°¤ÎÀÜÈø¼­¤Ç¤¹¡£¾ÜºÙ¤Ï
--.na
--\f2¹½À®Â°À­¤Îɽ\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ì¾Á°ÀÜÈø¼­\f2SmartCard\fP¤ÎPKCS#11¥­¡¼¥¹¥È¥¢¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÆâÍƤò¥ê¥¹¥È¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerName SunPKCS11\-SmartCard \\
--.fl
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-providerName \fIproviderName\fR
-+.RS 4
-+\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Ç2¤Ä°Ê¾å¤Î¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤¿¾ì¹ç¡¢\fI\-providerName\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤òÂоݤˤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î̾Á°¤Ç¤¹¡£
-+.sp
-+Oracle PKCS #11¥×¥í¥Ð¥¤¥À¤Î¾ì¹ç¡¢\fIproviderName\fR¤Ï\fISunPKCS11\-\fR\fITokenName\fR¤È¤¤¤¦·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤³¤Ç¡¢¹½À®Â°À­¤Îɽ¤Ç¾ÜºÙ¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢\fITokenName\fR¤Ï¡¢¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤¬¹½À®¤µ¤ì¤¿Ì¾Á°¤ÎÀÜÈø¼­¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ì¾Á°ÀÜÈø¼­\fISmartCard\fR¤Î\fIPKCS #11\fR¥­¡¼¥¹¥È¥¢¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \e
-+ \-providerName SunPKCS11\-SmartCard \e
- \-list
--.fl
--\fP
- .fi
--.TP 3
--\-Jjavaoption
--»ØÄꤵ¤ì¤¿\f2javaoption\fPʸ»úÎó¤òJava¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£(\f3jarsigner\fP¤Ï¡¢¼ÂºÝ¤Ë¤ÏJava¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¡Ö¥é¥Ã¥Ñ¡¼¡×¤Ç¤¹¡£)¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ØÄê¤Ç¤­¤ë¥¤¥ó¥¿¥×¥ê¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2java \-h\fP¤Þ¤¿¤Ï\f2java \-X\fP¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-tsa url
--\f2¡Ö\-tsa http://example.tsa.url¡×\fP¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£URL\f2http://example.tsa.url\fP¤Ï¡¢TSA(Time Stamping Authority)¤Î¾ì½ê¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2\-tsacert\fP¥ª¥×¥·¥ç¥ó¤Ç¸¡½Ð¤µ¤ì¤¿URL¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\f2\-tsa\fP¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
--.br
--.br
--¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢\f2jarsigner\fP¤Ï¡¢
--.na
--\f2RFC 3161\fP @
--.fi
--http://www.ietf.org/rfc/rfc3161.txt¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥×¥í¥È¥³¥ë(TSP)¤ò»ÈÍѤ·¤ÆTSA¤ÈÄÌ¿®¤·¤Þ¤¹¡£À®¸ù¤¹¤ë¤È¡¢TSA¤«¤éÊÖ¤µ¤ì¤¿¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥È¡¼¥¯¥ó¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤Î½ð̾¤È¤È¤â¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-tsacert alias
--\f2¡Ö\-tsacert alias¡×\fP¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\f2alias\fP¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¸½ºßÍ­¸ú¤ÊTSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ç¡¢TSA¤Î¾ì½ê¤òÆÃÄꤹ¤ëURL¤ò´Þ¤àSubject Information Access³ÈÄ¥µ¡Ç½¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--\f2\-tsacert\fP¤ò»ÈÍѤ·¤¿¾ì¹ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 3
--\-altsigner class
--ÂåÂؽð̾µ¡¹½¤ò»ÈÍѤ¹¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤Ç¡¢\f2com.sun.jarsigner.ContentSigner\fPÃê¾Ý¥¯¥é¥¹¤ò³ÈÄ¥¤¹¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ï¡¢\f2\-altsignerpath\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£\f2\-altsigner\fP¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤ë¤È¡¢\f2jarsigner\fP¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾µ¡¹½¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\f2jarsigner\fP¤Ï¥Ç¥Õ¥©¥ë¥È¤Î½ð̾µ¡¹½¤ò»ÈÍѤ·¤Þ¤¹¡£
--.br
--.br
--¤¿¤È¤¨¤Ð¡¢\f2com.sun.sun.jarsigner.AuthSigner\fP¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾µ¡¹½¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\f2jarsigner\fP¤Ç\f2¡Ö\-altsigner com.sun.jarsigner.AuthSigner¡×\fP¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
--.TP 3
--\-altsignerpath classpathlist
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë(¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ÏÁ°½Ò¤Î\f2\-altsigner\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤷ¤Þ¤¹)¤ª¤è¤Ó¤½¤Î¥¯¥é¥¹¤¬°Í¸¤¹¤ë¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ë¾ì¹ç¡¢°Ê²¼¤ÎÎã¤Î¤è¤¦¤ËJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Þ¤¹¡£
--.br
--.br
--ÀäÂХѥ¹¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f2classpathlist\fP¤ËÊ£¿ô¤Î¥Ñ¥¹¤äJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤ì¤é¤òSolaris¤Î¾ì¹ç¤Ï¥³¥í¥ó(\f2:\fP)¤Ç¡¢Windows¤Î¾ì¹ç¤Ï¥»¥ß¥³¥í¥ó(\f2;\fP)¤Ç¤½¤ì¤¾¤ì¶èÀÚ¤ê¤Þ¤¹¡£ÌÜŪ¤Î¥¯¥é¥¹¤¬¤¹¤Ç¤Ë¸¡º÷¥Ñ¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍפǤ¹¡£
--.br
--.br
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤à¡¢JAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-J\fIjavaoption\fR
-+.RS 4
-+»ØÄꤵ¤ì¤¿\fIjavaoption\fRʸ»úÎó¤òJava¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¥é¥Ã¥Ñ¡¼¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ØÄê¤Ç¤­¤ë¥¤¥ó¥¿¥×¥ê¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fIjava \-h\fR¤Þ¤¿¤Ï\fIjava \-X\fR¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-tsa \fIurl\fR
-+.RS 4
-+\fI\-tsa http://example\&.tsa\&.url\fR¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£URL
-+\fIhttp://example\&.tsa\&.url\fR¤Ï¡¢Time Stamping Authority (TSA)¤Î¾ì½ê¤òÆÃÄꤷ¡¢\fI\-tsacert\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¸¡½Ð¤µ¤ì¤¿URL¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\fI\-tsa\fR¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢\fIjarsigner\fR¤Ï¡¢RFC 3161¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥×¥í¥È¥³¥ë(TSP)¤ò»ÈÍѤ·¤ÆTSA¤ÈÄÌ¿®¤·¤Þ¤¹¡£À®¸ù¤¹¤ë¤È¡¢TSA¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤¿¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥È¡¼¥¯¥ó¤Ï¡¢½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤Î½ð̾¤È¤È¤â¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-tsacert \fIalias\fR
-+.RS 4
-+\fI\-tsacert\fR
-+\fIalias\fR¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ÊÌ̾¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÍ­¸ú¤ÊTSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤òÆÃÄꤷ¤Þ¤¹¡£¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ç¡¢TSA¤Î¾ì½ê¤òÆÃÄꤹ¤ëURL¤ò´Þ¤àSubject Information Access³ÈÄ¥µ¡Ç½¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-tsacert\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.PP
-+\-tsapolicyid \fIpolicyid\fR
-+.RS 4
-+TSA¥µ¡¼¥Ð¡¼¤ËÁ÷¿®¤¹¤ë¥Ý¥ê¥·¡¼ID¤ò¼±Ê̤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¼±ÊÌ»Ò(OID)¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢¥Ý¥ê¥·¡¼ID¤ÏÁ÷¿®¤µ¤ì¤º¡¢TSA¥µ¡¼¥Ð¡¼¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¥ê¥·¡¼ID¤òÁªÂò¤·¤Þ¤¹¡£
-+.sp
-+¥ª¥Ö¥¸¥§¥¯¥È¼±Ê̻Ҥϡ¢ITU Telecommunication Standardization Sector (ITU\-T)ɸ½à¤Ç¤¢¤ëX\&.696¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¼±Ê̻Ҥϡ¢Ä̾\fI1\&.2\&.3\&.4\fR¤Ê¤É¤Î¡¢Éé¤Ç¤Ï¤Ê¤¤¿ô»ú¤Î¥Ô¥ê¥ª¥É¶èÀÚ¤ê¤Î¥»¥Ã¥È¤Ç¤¹¡£
-+.RE
-+.PP
-+\-altsigner \fIclass\fR
-+.RS 4
-+¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ÂåÂؽð̾¥á¥«¥Ë¥º¥à¤ò»ØÄꤷ¤Þ¤¹¡£´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤Ï¡¢\fIcom\&.sun\&.jarsigner\&.ContentSigner\fRÃê¾Ý¥¯¥é¥¹¤ò³ÈÄ¥¤¹¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¼±Ê̤·¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ï¡¢\fI\-altsignerpath\fR¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£\fI\-altsigner\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.sp
-+¤¿¤È¤¨¤Ð¡¢\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fR¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢jarsigner¤Î¥ª¥×¥·¥ç¥ó\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fR¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-altsignerpath \fIclasspathlist\fR
-+.RS 4
-+¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¤½¤ì¤¬°Í¸¤¹¤ëJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£\fI\-altsigner\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£
-+.sp
-+ÀäÂХѥ¹¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁêÂХѥ¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\fIclasspathlist\fR¤ËÊ£¿ô¤Î¥Ñ¥¹¤äJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¤½¤ì¤é¤ò¡¢Oracle Solaris¤Î¾ì¹ç¤Ï¥³¥í¥ó(:)¤Ç¡¢Windows¤Î¾ì¹ç¤Ï¥»¥ß¥³¥í¥ó(;)¤Ç¡¢¤½¤ì¤¾¤ì¶èÀÚ¤ê¤Þ¤¹¡£ÌÜŪ¤Î¥¯¥é¥¹¤¬¤¹¤Ç¤Ë¸¡º÷¥Ñ¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍפǤ¹¡£
-+.sp
-+¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
--\-altsignerpath /home/user/lib/authsigner.jar
--.fl
--\fP
-+\-altsignerpath /home/user/lib/authsigner\&.jar
- .fi
--JAR¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.if n \{\
-+.RE
-+.\}
-+¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò¾Êά¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
- \-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
--.fl
--\fP
- .fi
--JAR¥Õ¥¡¥¤¥ë̾¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ëα°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-strict
--½ð̾¤Þ¤¿¤Ï¸¡¾Ú½èÍýÃæ¤Ë¡¢¤Ê¤ó¤é¤«¤Î·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¸«¤Ä¤«¤Ã¤¿·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢·Ù¹ð¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-verbose:sub\-options
--¸¡¾Ú½èÍý¤Î¾ì¹ç¡¢É½¼¨¤¹¤ë¾ðÊó¤ÎÎ̤ò·èÄꤹ¤ë¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤Ë»ØÄê¤Ç¤­¤Þ¤¹¡£\f2\-certs\fP¤â»ØÄꤷ¤¿¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥â¡¼¥É(¤Þ¤¿¤Ï¥µ¥Ö¥ª¥×¥·¥ç¥óall)¤Ç¤Ï¡¢¥¨¥ó¥È¥ê¤¬½èÍý¤µ¤ì¤ë¤¿¤Ó¤Ë¤½¤ì¤é¤Î³Æ¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¡¢¤½¤Î¸å¤ËJAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2\-certs\fP¤È\f2\-verbose:grouped\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤È¤½¤Î¾ÚÌÀ½ñ¾ðÊ󤬡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2\-certs\fP¤È\f2\-verbose:summary\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤È¤½¤Î¾ÚÌÀ½ñ¾ðÊ󤬥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¤¬¡¢³Æ¥¨¥ó¥È¥ê¤Î¾ÜºÙ¤¬¡Ö1¤Ä¤Î¥¨¥ó¥È¥ê(¤ª¤è¤Ó¤½¤ì°Ê¾å)¡×¤È¤·¤ÆÍ×Ì󤵤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Îã¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-strict
-+.RS 4
-+½ð̾¤Þ¤¿¤Ï¸¡¾Ú½èÍýÃæ¤Ë¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬È¯¹Ô¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê¸¡½Ð¤µ¤ì¤¿½ÅÂç¤Ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£¥¨¥é¡¼¤È·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verbose \fIsuboptions\fR
-+.RS 4
-+¸¡¾Ú½èÍý¤Î¾ì¹ç¡¢\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢É½¼¨¤¹¤ë¾ðÊó¤ÎÎ̤ò·èÄꤹ¤ë¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤷ¤¿¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥â¡¼¥É(¤Þ¤¿¤Ï¥µ¥Ö¥ª¥×¥·¥ç¥ó\fIall\fR)¤Ç¤Ï¡¢¥¨¥ó¥È¥ê¤¬½èÍý¤µ¤ì¤ë¤¿¤Ó¤Ë³Æ¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¡¢¤½¤Î¸å¤ËJAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£\fI\-certs\fR¤ª¤è¤Ó\fI\-verbose:grouped\fR¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤¬¡¢¤½¤Î¾ÚÌÀ½ñ¾ðÊó¤È¤È¤â¤Ë¡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\fI\-certs\fR¤ª¤è¤Ó\fI\-verbose:summary\fR¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤¬¡¢¤½¤Î¾ÚÌÀ½ñ¾ðÊó¤È¤È¤â¤Ë¡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£³Æ¥¨¥ó¥È¥ê¤Î¾ÜºÙ¤Ï¡¢\fI1¤Ä¤Î¥¨¥ó¥È¥ê(°Ê¾å)\fR¤Ë¤Þ¤È¤á¤é¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£Îã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.SH "¥¨¥é¡¼¤È·Ù¹ð"
-+.PP
-+½ð̾¤Þ¤¿¤Ï¸¡¾Ú¥×¥í¥»¥¹Ãæ¤Ë¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¡¢ÍÍ¡¹¤Ê¥¨¥é¡¼¤Þ¤¿¤Ï·Ù¹ð¤¬È¯¹Ô¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-+.PP
-+¾ã³²¤¬¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É1¤Ç½ªÎ»¤·¤Þ¤¹¡£¾ã³²¤Ï¤Ê¤¤¤¬¡¢1¤Ä°Ê¾å¤Î½ÅÂç¤Ê·Ù¹ð¤¬¤¢¤ë¾ì¹ç¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ\fB¤¤¤Ê¤¤\fR¾ì¹ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É0¤Ç½ªÎ»¤·¡¢\fI\-strict\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï·Ù¹ð¥³¡¼¥É¤ÎORÃͤǽªÎ»¤·¤Þ¤¹¡£¾ðÊó·Ù¹ð¤Î¤ß¤¬¤¢¤ë¡¢¤Þ¤¿¤Ï·Ù¹ð¤¬¤Þ¤Ã¤¿¤¯¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¾ï¤Ë¥³¡¼¥É0¤Ç½ªÎ»¤·¤Þ¤¹¡£
-+.PP
-+¤¿¤È¤¨¤Ð¡¢¥¨¥ó¥È¥ê¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Ç¡¢¥Õ¥¡¥¤¥ë¤Î½ð̾¤òµö²Ä¤·¤Ê¤¤KeyUsage³ÈÄ¥µ¡Ç½¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É12 (=4+8)¤Ç½ªÎ»¤·¤Þ¤¹¡£
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
-+.br
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+Unix¥Ù¡¼¥¹¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Ç¤Ï0¤«¤é255¤Þ¤Ç¤ÎÃͤΤߤ¬Í­¸ú¤Î¤¿¤á¡¢½ªÎ»¥³¡¼¥É¤ÏºÆÍøÍѤµ¤ì¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.PP
-+¼¡¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤êȯ¹Ô¤Ç¤­¤ë¥¨¥é¡¼¤ª¤è¤Ó·Ù¹ð¤Î̾Á°¡¢¥³¡¼¥É¡¢ÀâÌÀ¤òµ­½Ò¤·¤Þ¤¹¡£
-+.SS "¾ã³²"
-+.PP
-+¥³¥Þ¥ó¥É¥é¥¤¥ó²òÀÏ¥¨¥é¡¼¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¸°¥Ú¥¢¤ò¸¡º÷¤Ç¤­¤Ê¤¤¡¢¤Þ¤¿¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¼ºÇԤʤÉ(¸ÂÄꤵ¤ì¤Þ¤»¤ó)¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Î¼ºÇÔÍýͳ¡£
-+.PP
-+failure
-+.RS 4
-+¥³¡¼¥É1¡£½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.SS "½ÅÂç¤Ê·Ù¹ð"
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
-+.br
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢½ÅÂç¤Ê·Ù¹ð¤Ï¥¨¥é¡¼¤È¤·¤ÆÊó¹ð¤µ¤ì¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¤Ë¥¨¥é¡¼¤¬¤¢¤ë¡¢¤Þ¤¿¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¾¤ÎÌäÂ꤬¤¢¤ë¤Ê¤É¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤¬½ÅÂç¤Ê·Ù¹ð¤òȯ¹Ô¤¹¤ëÍýͳ¡£
-+.PP
-+hasExpiredCert
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Î¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+notYetValidCert
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬¤Þ¤ÀÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+chainNotValidated
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬Àµ¤·¤¯¸¡¾Ú¤Ç¤­¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badKeyUsage
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤ÎJAR¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎKeyUsage³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badExtendedKeyUsage
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎExtendedKeyUsage³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badNetscapeCertType
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎNetscapeCertType³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+hasUnsignedEntry
-+.RS 4
-+¥³¡¼¥É16¡£¤³¤Îjar¤Ë¤Ï¡¢À°¹çÀ­¥Á¥§¥Ã¥¯¤ò¤·¤Æ¤¤¤Ê¤¤Ì¤½ð̾¤Î¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+notSignedByAlias
-+.RS 4
-+¥³¡¼¥É32¡£¤³¤Îjar¤Ë¤Ï¡¢»ØÄꤵ¤ì¤¿ÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ºÑ¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+aliasNotInStore
-+.RS 4
-+¥³¡¼¥É32¡£¤³¤Îjar¤Ë¤Ï¡¢¤³¤Î¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ºÑ¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-+.RE
-+.SS "¾ðÊó·Ù¹ð"
-+.PP
-+¾ðÊó·Ù¹ð¤Ë¤Ï¡¢¥¨¥é¡¼¤Ç¤Ï¤Ê¤¤¤¬ÉÔŬÀڤȤߤʤµ¤ì¤ë¤â¤Î¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¥³¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-+.PP
-+hasExpiringCert
-+.RS 4
-+¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬6¤«·î°ÊÆâ¤Ë´ü¸ÂÀÚ¤ì¤È¤Ê¤ë¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+noTimestamp
-+.RS 4
-+¤³¤Îjar¤Ë¤Ï¡¢¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤Þ¤Ê¤¤½ð̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ê¤·¤Ç¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü¸Â(·Á¼°¤Ï\fIYYYY\-MM\-DD\fR)¸å¤Þ¤¿¤Ï¾­Íè¤Î¼è¾ÃÆü¸å¡¢¥æ¡¼¥¶¡¼¤Ï¤³¤ÎJAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
- .RE
--
--.LP
- .SH "Îã"
--.LP
--.SS
--JAR¥Õ¥¡¥¤¥ë¤Î½ð̾
--.LP
--.LP
--bundle.jar¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢working¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Îmystore¤È¤¤¤¦¥­¡¼¥¹¥È¥¢¤Ë¤¢¤ë¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬jane¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æsbundle.jar¤È¤¤¤¦½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¾å¤Î¥³¥Þ¥ó¥É¤Ç¤Ï\f2\-sigfile\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢ÊÌ̾¤«¤é¥Ç¥Õ¥©¥ë¥È̾¤¬ÉÕ¤±¤é¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤½¤ì¤é¤Î̾Á°¤Ï\f2JANE.SF\fP¤ª¤è¤Ó\f2JANE.DSA\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ÈÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤ë¥×¥í¥ó¥×¥È¤òɽ¼¨¤¹¤ë¾ì¹ç¤Ï¡¢¾å¤Î¥³¥Þ¥ó¥É¤òû½Ì¤·¤Æ¼¡¤Î¤è¤¦¤ËÆþÎϤǤ­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore
--.fl
-- \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢(¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î.keystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢)¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Ë¼¨¤¹¤è¤¦¤Ë¡¢¥­¡¼¥¹¥È¥¢¤Î»ØÄê¤ò¾Êά¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--ºÇ¸å¤Ë¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë(\f2bundle.jar\fP)¤ò½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Çñ½ã¤Ë¾å½ñ¤­¤¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë\f2\-signedjar\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.SS
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¡¢¤Ä¤Þ¤ê½ð̾¤¬Í­¸ú¤ÇJAR¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify sbundle.jar
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢
--.LP
--.nf
--\f3
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤è¤ê¿¤¯¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\f2\-verbose\fP¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç\f3jarsigner\fP¤ò»ÈÍѤ¹¤ëÎã¤È¤½¤Î½ÐÎÏÎã¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify \-verbose sbundle.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx.class
--.fl
-- smk 849 Fri Sep 26 16:12:46 PDT 1997 test.class
--.fl
--
--.fl
-+.SS "JAR¥Õ¥¡¥¤¥ë¤Î½ð̾"
-+.PP
-+¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬\fIworking\fR¥Ç¥£¥ì¥¯¥È¥ê¤Î\fImystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë¤¢¤ë\fIjane\fR¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Çbundle\&.jar¤Ë½ð̾¤·¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ësbundle\&.jar¤È¤¤¤¦Ì¾Á°¤òÉÕ¤±¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-storepass <keystore password>
-+ \-keypass <private key password> \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+Á°½Ò¤Î¥³¥Þ¥ó¥É¤Ç¤Ï\fI\-sigfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤ëÀ¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢ÊÌ̾¤Ë´ð¤Å¤¤¤¿¥Ç¥Õ¥©¥ë¥È¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤é¤Ï¡¢Ì¾Á°ÉÕ¤­¤Î\fIJANE\&.SF\fR¤ª¤è¤Ó\fIJANE\&.DSA\fR¤Ç¤¹¡£
-+.PP
-+¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ª¤è¤ÓÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤òµá¤á¤é¤ì¤ë¾ì¹ç¡¢Á°½Ò¤Î¥³¥Þ¥ó¥É¤òû½Ì¤·¤Æ¡¢¼¡¤Î¤³¤È¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore
-+ \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤¬¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢(¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î\&.keystore)¤Ç¤¢¤ë¾ì¹ç¡¢¼¡¤Ë¼¨¤¹¤è¤¦¤Ë¡¢¥­¡¼¥¹¥È¥¢¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+ÆþÎÏJAR¥Õ¥¡¥¤¥ë(bundle\&.jar)¤ò½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ç¾å½ñ¤­¤¹¤ë¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë\fI\-signedjar\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú"
-+.PP
-+½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤Æ¡¢½ð̾¤¬Í­¸ú¤ÇJAR¥Õ¥¡¥¤¥ë¤¬²þ¤¶¤ó¤µ¤ì¤Ê¤«¤Ã¤¿¤³¤È¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-verify sbundle\&.jar
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢\fIjar verified\fR¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Í­¸ú¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¾ÜºÙ¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¤ò\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ¹¤ë¥µ¥ó¥×¥ë¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-verify \-verbose sbundle\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx\&.class
-+ smk 849 Fri Sep 26 16:12:46 PDT 1997 test\&.class
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.SS
--¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤¿¸¡¾Ú
--.LP
--.LP
--¸¡¾Ú»þ¤Ë\f2\-verify\fP¤È\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ\f2\-certs\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó(X.509¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤ÓJAR¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.SF
--.fl
-- 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst.class
--.fl
--
--.fl
-- X.509, CN=Test Group, OU=Java Software, O=Sun Microsystems, L=CUP, S=CA, C=US (javatest)
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
--
--.fl
-+
-+ jar verified\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤¿¸¡¾Ú"
-+.PP
-+\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò\fI\-verify\fR¤ª¤è¤Ó\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¤Î¼±ÊÌ̾¾ðÊó(X\&.509¾ÚÌÀ½ñ¤Î¾ì¹ç)¤¬´Þ¤Þ¤ì¡¢´Ý¥«¥Ã¥³Æâ¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Î¸ø³«¸°¾ÚÌÀ½ñ¤Ë°ìÃפ¹¤ë¾ì¹ç¤Î½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.SF
-+ 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.DSA
-+ smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst\&.class
-+
-+ X\&.509, CN=Test Group, OU=Java Software, O=Oracle, L=CUP, S=CA, C=US (javatest)
-+ X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤¬X.509¾ÚÌÀ½ñ¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¼±ÊÌ̾¾ðÊó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Î¥¿¥¤¥×¤ÈÊÌ̾¤Î¤ß¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ¤¬PGP¾ÚÌÀ½ñ¤Ç¡¢ÊÌ̾¤¬bob¤Î¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- PGP, (bob)
--.fl
--\fP
--.fi
--
--.LP
--.SS
--¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ð̾¼Ô¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤¬¡¢JDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢½ð̾¼Ô¤Ï¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎϤˤϡÖi¡×¤È¤¤¤¦µ­¹æ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤¬¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¡Ök¡×¤È¡Öi¡×¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f2\-certs\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.SF
--.fl
-- 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.DSA
--.fl
-- smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile.html
--.fl
--
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
-- X.509, CN=Duke, OU=Java Software, O=Sun, L=cup, S=ca, C=us [duke]
--.fl
--
--.fl
-+
-+ jar verified\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤¬X\&.509¾ÚÌÀ½ñ¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¼±ÊÌ̾¾ðÊó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Î¥¿¥¤¥×¤ÈÊÌ̾¤Î¤ß¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ¤¬PGP¾ÚÌÀ½ñ¤Ç¡¢ÊÌ̾¤¬\fIbob\fR¤Ç¤¢¤ë¾ì¹ç¡¢\fIPGP, (bob)\fR¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.SS "¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ð̾¼Ô¤ò´Þ¤à¸¡¾Ú"
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤¬JDK 1\&.1¤Î\fIjavakey\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¡¢½ð̾¼Ô¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¢¤ë¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎϤˤÏ\fIi\fR¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¾ì¹ç¡¢\fIk\fR¤È\fIi\fR¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-+.PP
-+\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ë»ÈÍѤµ¤ì¤ë´Ý¥«¥Ã¥³¤Ç¤Ï¤Ê¤¯¡¢Â祫¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+ jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF
-+ 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA
-+ smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html
-+
-+ X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)
-+ X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
- i = at least one certificate was found in identity scope
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--ÊÌ̾duke¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¤³¤ÎÊÌ̾¤Ï¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ç¤Ï¤Ê¤¯¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ç¤¹¡£
--.LP
--.SH "·Ù¹ð"
--.LP
--½ð̾/¸¡¾Ú½èÍýÃæ¤Ë¤Ï¡¢jarsigner¤«¤éÍÍ¡¹¤Ê·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î·Ù¹ð¥³¡¼¥É¤Ï¼¡¤Î¤è¤¦¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- hasExpiringCert 2
--.fl
-- This jar contains entries whose signer certificate will expire within six months
--.fl
--
--.fl
-- hasExpiredCert 4
--.fl
-- This jar contains entries whose signer certificate has expired.
--.fl
--
--.fl
-- notYetValidCert 4
--.fl
-- This jar contains entries whose signer certificate is not yet valid.
--.fl
--
--.fl
-- chainNotValidated 4
--.fl
-- This jar contains entries whose certificate chain cannot be correctly validated.
--.fl
--
--.fl
-- badKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--.fl
--
--.fl
-- badExtendedKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's ExtendedKeyUsage extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- badNetscapeCertType 8
--.fl
-- This jar contains entries whose signer certificate's NetscapeCertType extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- hasUnsignedEntry 16
--.fl
-- This jar contains unsigned entries which have not been integrity\-checked.
--.fl
--
--.fl
-- notSignedByAlias 32
--.fl
-- This jar contains signed entries which are not signed by the specified alias(es)
--.fl
--
--.fl
-- aliasNotInStore 32
--.fl
-- This jar contains signed entries that are not signed by alias in this keystore
--.fl
--
--.fl
--\fP
--.fi
--
--.LP
--.LP
--\f2\-strict\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¸¡½Ð¤µ¤ì¤¿·Ù¹ð¤ÎOR¤ò¼è¤Ã¤¿Ãͤ¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤È¤·¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¨¥ó¥È¥ê¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¡¢¤«¤Ä¤½¤Î¾ÚÌÀ½ñ¤ÎkeyUsage³ÈÄ¥¤Ç¥Õ¥¡¥¤¥ë¤Î½ð̾¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢½ªÎ»¥³¡¼¥É12(=4+8)¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f3Ãí°Õ\fP: UNIX¤Ç»ÈÍѲÄǽ¤ÊÃͤÏ0¤«¤é255¤Î¤ß¤Ç¤¢¤ë¤¿¤á¡¢½ªÎ»¥³¡¼¥É¤ÏºÆÍøÍѤµ¤ì¤Þ¤¹¡£¤¤¤º¤ì¤Ë¤·¤Æ¤â¡¢½ð̾/¸¡¾Ú½èÍý¤¬¼ºÇÔ¤¹¤ë¤È¡¢¼¡¤Î½ªÎ»¥³¡¼¥É¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
--failure 1
--.fl
--\fP
--.fi
--
--.LP
--.SS
--JDK 1.1¤È¤Î¸ß´¹À­
--.LP
--.LP
--\f3keytool\fP¥Ä¡¼¥ë¤È\f3jarsigner\fP¥Ä¡¼¥ë¤Ï¡¢JDK 1.1¤ÇÄ󶡤µ¤ì¤Æ¤¤¤¿\f3javakey\fP¥Ä¡¼¥ë¤ò´°Á´¤ËÃÖ¤­´¹¤¨¤ë¤â¤Î¤Ç¤¹¡£¤³¤ì¤é¤Î¿·¤·¤¤¥Ä¡¼¥ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÈÈëÌ©¸°¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ëµ¡Ç½¤ä¡¢½ð̾¤ÎÀ¸À®¤Ë²Ã¤¨¤Æ½ð̾¤ò¸¡¾Ú¤¹¤ëµ¡Ç½¤Ê¤É¡¢\f3javakey\fP¤è¤ê¿¤¯¤Î¤òµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢\f3javakey\fP¤¬ºîÀ®¤·¤Æ´ÉÍý¤·¤Æ¤¤¤¿¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂå¤ï¤ë¤â¤Î¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢·Á¼°¤È¡¢1.1¤Î\f3javakey\fP¤¬»ÈÍѤ·¤Æ¤¤¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹·Á¼°¤È¤Î´Ö¤Ë¤Ï²¼°Ì¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¼¡¤Î¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--\f3keytool\fP¤Î\f2\-identitydb\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ðÊó¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--\f3jarsigner\fP¤Ï¡¢°ÊÁ°¤Ë\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--\f3jarsigner\fP¤Ï¡¢\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢Java 2 SDK¤Î¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î½ð̾¼ÔÊÌ̾¤òǧ¼±¤·¡¢¤³¤ì¤é¤òÂоݤ˽èÍý¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¼¡¤Îɽ¤Ï¡¢JDK 1.1.x¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤¬¡¢Java 2¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤É¤Î¤è¤¦¤Ë°·¤ï¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--.TS
--.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
--.de 35
--.ps \n(.s
--.vs \n(.vu
--.in \n(.iu
--.if \n(.u .fi
--.if \n(.j .ad
--.if \n(.j=0 .na
--..
--.nf
--.nr #~ 0
--.if n .nr #~ 0.6n
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.fc
--.nr 33 \n(.s
--.rm 80 81 82 83 84
--.nr 34 \n(.lu
--.eo
--.am 80
--.br
--.di a+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(80 .ll \n(80u
--.in 0
--\f3JAR¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥×\fP
--.br
--.di
--.nr a| \n(dn
--.nr a- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di b+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--\f31.1¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£\fP
--.br
--.di
--.nr b| \n(dn
--.nr b- \n(dl
--..
--.ec \
--.eo
--.am 82
--.br
--.di c+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(82 .ll \n(82u
--.in 0
--\f31.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava 2 Platform¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤ë¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£(4)\fP
--.br
--.di
--.nr c| \n(dn
--.nr c- \n(dl
--..
--.ec \
--.eo
--.am 83
--.br
--.di d+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(83 .ll \n(83u
--.in 0
--\f3¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤ËÆø¢¤òÉÕÍ¿\fP
--.br
--.di
--.nr d| \n(dn
--.nr d- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di e+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr e| \n(dn
--.nr e- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di f+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr f| \n(dn
--.nr f- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di g+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr g| \n(dn
--.nr g- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di h+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--¤Ï¤¤/¿®Íê¤Ç¤­¤Ê¤¤
--.br
--.di
--.nr h| \n(dn
--.nr h- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di i+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢(3)
--.br
--.di
--.nr i| \n(dn
--.nr i- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di j+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--¤Ï¤¤/¿®Íê¤Ç¤­¤Ê¤¤
--.br
--.di
--.nr j| \n(dn
--.nr j- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di k+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢(1¡¢3)
--.br
--.di
--.nr k| \n(dn
--.nr k- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di l+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢¤È¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇÉÕÍ¿¤µ¤ì¤ëÆø¢
--.br
--.di
--.nr l| \n(dn
--.nr l- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di m+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢¤È¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇÉÕÍ¿¤µ¤ì¤ëÆø¢(2)
--.br
--.di
--.nr m| \n(dn
--.nr m- \n(dl
--..
--.ec \
--.35
--.nf
--.ll \n(34u
--.nr 80 0
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾¤Î¤Ê¤¤JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.80
--.rm 80
--.nr 38 \n(a-
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 81 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.81
--.rm 81
--.nr 38 \n(b-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \n(h-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \n(j-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 82 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.82
--.rm 82
--.nr 38 \n(c-
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 83 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.83
--.rm 83
--.nr 38 \n(d-
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 84 0
--.nr 38 \w\f3ÉÕÍ¿¤µ¤ì¤ëÆø¢\fP
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.if \n(84<\n(38 .nr 84 \n(38
--.84
--.rm 84
--.nr 38 \n(e-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(f-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(g-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(i-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(k-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(l-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(m-
--.if \n(84<\n(38 .nr 84 \n(38
--.35
--.nf
--.ll \n(34u
--.nr 38 1n
--.nr 79 0
--.nr 40 \n(79+(0*\n(38)
--.nr 80 +\n(40
--.nr 41 \n(80+(3*\n(38)
--.nr 81 +\n(41
--.nr 42 \n(81+(3*\n(38)
--.nr 82 +\n(42
--.nr 43 \n(82+(3*\n(38)
--.nr 83 +\n(43
--.nr 44 \n(83+(3*\n(38)
--.nr 84 +\n(44
--.nr TW \n(84
--.if t .if \n(TW>\n(.li .tm Table at line 1090 file Input is too wide - \n(TW units
--.fc  
--.nr #T 0-1
--.nr #a 0-1
--.eo
--.de T#
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.mk ##
--.nr ## -1v
--.ls 1
--.ls
--..
--.ec
--.ne \n(a|u+\n(.Vu
--.ne \n(b|u+\n(.Vu
--.ne \n(c|u+\n(.Vu
--.ne \n(d|u+\n(.Vu
--.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'\h'|\n(43u'\h'|\n(44u'\f3ÉÕÍ¿¤µ¤ì¤ëÆø¢\fP
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(40u
--.in +\n(37u
--.a+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.b+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(42u
--.in +\n(37u
--.c+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(43u
--.in +\n(37u
--.d+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(e|u+\n(.Vu
--.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.e+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(f|u+\n(.Vu
--.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾¤Î¤Ê¤¤JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.f+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(g|u+\n(.Vu
--.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.g+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(h|u+\n(.Vu
--.ne \n(i|u+\n(.Vu
--.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.h+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.i+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(j|u+\n(.Vu
--.ne \n(k|u+\n(.Vu
--.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.j+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.k+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(l|u+\n(.Vu
--.if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.l+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(m|u+\n(.Vu
--.if (\n(m|+\n(#^-1v)>\n(#- .nr #- +(\n(m|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.m+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤Ï¤¤\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.fc
--.nr T. 1
--.T# 1
--.35
--.rm a+
--.rm b+
--.rm c+
--.rm d+
--.rm e+
--.rm f+
--.rm g+
--.rm h+
--.rm i+
--.rm j+
--.rm k+
--.rm l+
--.rm m+
--.TE
--.if \n-(b.=0 .nr c. \n(.c-\n(d.-50
--
--.LP
--.LP
--Ãí°Õ:
--.LP
--.RS 3
--.TP 3
--1.
--¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤¬¤¢¤ë¾ì¹ç¡¢¤½¤ì¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤·¤Æ¡¢ÉÕÍ¿¤µ¤ì¤¿Æø¢¤Ë¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÀßÄ꤬ȿ±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 3
--2.
--¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
--.TP 3
--3.
--Java 2¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¡¢¿®Íê¤Ç¤­¤Ê¤¤¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
--.TP 3
--4.
--Java 2 SDK¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤ë¤Î¤Ï¡¢¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Î¤ß¤Ç¤¹¡£
--.RE
--
--.LP
--.SH "´ØÏ¢¹àÌÜ"
--.LP
--.RS 3
--.TP 2
--o
--jar(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
--.TP 2
--o
--keytool(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
--.TP 2
--o
--\f3jarsigner\fP¥Ä¡¼¥ë¤Î»ÈÍÑÎã¤Ï¡¢
--.na
--\f4Java¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/index.html¤Î
--.na
--\f4¥»¥­¥å¥ê¥Æ¥£\fP @
-+
-+ jar verified\&.
- .fi
--http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
-+.if n \{\
- .RE
--
--.LP
--
-+.\}
-+.PP
-+\fBÃí°Õ: \fRÊÌ̾¤¬¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ç¤Ï¤Ê¤¯¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹¤Ë¤Ï¡¢ÊÌ̾\fIduke\fR¤òÂ祫¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡£
-+.SH "JDK 1.1¤Î¸ß´¹À­"
-+.PP
-+\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤Ï¡¢JDK 1\&.1¤Ë¤ª¤±¤ë\fIjavakey\fR¥Ä¡¼¥ë¤òÃÖ¤­´¹¤¨¤¿¤â¤Î¤Ç¤¹¡£¤³¤ì¤é¤Î¿·¤·¤¤¥Ä¡¼¥ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÈÈëÌ©¸°¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ëµ¡Ç½¤ä¡¢½ð̾¤ÎÀ¸À®¤Ë²Ã¤¨¤Æ½ð̾¤ò¸¡¾Ú¤¹¤ëµ¡Ç½¤Ê¤É¡¢\fIjavakey\fR¤è¤ê¿¤¯¤Î¤òµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
-+.PP
-+¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢\fIjavakey\fR¤¬ºîÀ®¤·¤Æ´ÉÍý¤·¤Æ¤¤¤¿¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂå¤ï¤ë¤â¤Î¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢·Á¼°¤È¡¢JDK 1\&.1¤Î\fIjavakey\fR¤¬»ÈÍѤ·¤Æ¤¤¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹·Á¼°¤È¤Î´Ö¤Ë¤Ï¡¢²¼°Ì¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¼¡¤ÎÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIkeytool \-identitydb\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥­¡¼¥¹¥È¥¢¤Ë¾ðÊó¤ò¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjavakey\fR¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JDK¤Î¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1\&.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î½ð̾¼ÔÊÌ̾¤òǧ¼±¤·¡¢¤½¤ì¤òÂоݤ˽èÍý¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.SS "½ð̾¤Î¤Ê¤¤JAR"
-+.PP
-+½ð̾¤Î¤Ê¤¤JAR¤Ë¤Ï¡¢¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â¤¬¤¢¤ê¤Þ¤¹¡£
-+.SS "½ð̾ÉÕ¤­JAR"
-+.PP
-+½ð̾ÉÕ¤­JAR¤Ë¤Ï¡¢µ­½Ò¤É¤ª¤ê¤ÎJDK 1\&.1\&.\fIn\fR¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Î¥¹¥Æ¡¼¥¿¥¹¤Ë´ð¤Å¤¤¤¿¸¢¸Â¹½À®¤¬¤¢¤ê¤Þ¤¹¡£JDK¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤ë¤Î¤Ï¡¢¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Î¤ß¤Ç¤¹¡£
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: ¤Ï¤¤/¿®Íꤵ¤ì¤Ê¤¤
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î3¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: ¤Ï¤¤/¿®Íꤵ¤ì¤Ê¤¤
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ª¤è¤Ó3¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î2¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÉÕÍ¿¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÃí°Õ\fR
-+.RS 4
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 1.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 1." 4.2
-+.\}
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Þ¤¿¤ÏÊÌ̾¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤¬¤¢¤ë¾ì¹ç¡¢¤½¤ì¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤·¤Æ¡¢ÉÕÍ¿¤µ¤ì¤¿¸¢¸Â¤Ë¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÀßÄ꤬ȿ±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 2.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 2." 4.2
-+.\}
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 3.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 3." 4.2
-+.\}
-+Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¡¢¿®Íê¤Ç¤­¤Ê¤¤¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.RE
-+.SH "»²¾È"
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+jar(1)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+keytool(1)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html¤Ë¤¢¤ë
-+¡Ö¥³¡¼¥¹: Java SE¤Î¥»¥­¥å¥ê¥Æ¥£µ¡Ç½¡×
-+.RE
-+.br
-+'pl 8.5i
-+'bp
---- jdk/src/linux/doc/man/jarsigner.1 2013-09-06 11:27:47.000000000 -0700
-+++ jdk/src/linux/doc/man/jarsigner.1 2014-01-18 12:16:22.000000000 -0800
-@@ -1,1569 +1,985 @@
--." 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
--." under the terms of the GNU General Public License version 2 only, as
--." published by the Free Software Foundation.
--."
--." This code is distributed in the hope that it will be useful, but WITHOUT
--." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--." version 2 for more details (a copy is included in the LICENSE file that
--." accompanied this code).
--."
--." You should have received a copy of the GNU General Public License version
--." 2 along with this work; if not, write to the Free Software Foundation,
--." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--."
--." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--." or visit www.oracle.com if you need additional information or have any
--." questions.
--."
--.TH jarsigner 1 "16 Mar 2012"
--
--.LP
--.SH "Name"
--jarsigner \- JAR Signing and Verification Tool
--.LP
--.LP
--Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files.
--.LP
--.SH "SYNOPSIS"
--.LP
--.nf
--\f3
--.fl
--\fP\f3jarsigner\fP [ options ] jar\-file alias
--.fl
--\f3jarsigner\fP \-verify [ options ] jar\-file [alias...]
--.fl
--.fi
--
--.LP
--.LP
--The jarsigner \-verify command can take zero or more keystore alias names after the jar filename. When specified, jarsigner will check that the certificate used to verify each signed entry in the jar file matches one of the keystore aliases. The aliases are defined in the keystore specified by \-keystore, or the default keystore.
--.LP
--.SH "DESCRIPTION"
--.LP
--.LP
--The \f3jarsigner\fP tool is used for two purposes:
--.LP
--.RS 3
--.TP 3
--1.
--to sign Java ARchive (JAR) files, and
--.TP 3
--2.
--to verify the signatures and integrity of signed JAR files.
--.RE
--
--.LP
--.LP
--The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution. A tool named jar(1) enables developers to produce JAR files. (Technically, any zip file can also be considered a JAR file, although when created by \f3jar\fP or processed by \f3jarsigner\fP, JAR files also contain a META\-INF/MANIFEST.MF file.)
--.LP
--.LP
--A \f2digital signature\fP is a string of bits that is computed from some data (the data being "signed") and the private key of an entity (a person, company, etc.). Like a handwritten signature, a digital signature has many useful characteristics:
--.LP
--.RS 3
--.TP 2
--o
--Its authenticity can be verified, via a computation that uses the public key corresponding to the private key used to generate the signature.
--.TP 2
--o
--It cannot be forged, assuming the private key is kept secret.
--.TP 2
--o
--It is a function of the data signed and thus can't be claimed to be the signature for other data as well.
--.TP 2
--o
--The signed data cannot be changed; if it is, the signature will no longer verify as being authentic.
--.RE
--
--.LP
--.LP
--In order for an entity's signature to be generated for a file, the entity must first have a public/private key pair associated with it, and also one or more certificates authenticating its public key. A \f2certificate\fP is a digitally signed statement from one entity, saying that the public key of some other entity has a particular value.
--.LP
--.LP
--\f3jarsigner\fP uses key and certificate information from a \f2keystore\fP to generate digital signatures for JAR files. A keystore is a database of private keys and their associated X.509 certificate chains authenticating the corresponding public keys. The keytool(1) utility is used to create and administer keystores.
--.LP
--.LP
--\f3jarsigner\fP uses an entity's private key to generate a signature. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file. \f3jarsigner\fP can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file).
--.LP
--.LP
--\f3jarsigner\fP can generate signatures that include a timestamp, thus enabling systems/deployer (including Java Plug\-in) to check whether the JAR file was signed while the signing certificate was still valid. In addition, APIs will allow applications to obtain the timestamp information.
--.LP
--.LP
--At this time, \f3jarsigner\fP can only sign JAR files created by the SDK jar(1) tool or zip files. (JAR files are the same as zip files, except they also have a META\-INF/MANIFEST.MF file. Such a file will automatically be created when \f3jarsigner\fP signs a zip file.)
--.LP
--.LP
--The default \f3jarsigner\fP behavior is to \f2sign\fP a JAR (or zip) file. Use the \f2\-verify\fP option to instead have it \f2verify\fP a signed JAR file.
--.LP
--.SS
--Keystore Aliases
--.LP
--.LP
--All keystore entities are accessed via unique \f2aliases\fP.
--.LP
--.LP
--When using \f3jarsigner\fP to sign a JAR file, you must specify the alias for the keystore entry containing the private key needed to generate the signature. For example, the following will sign the JAR file named "MyJARFile.jar", using the private key associated with the alias "duke" in the keystore named "mystore" in the "working" directory. Since no output file is specified, it overwrites MyJARFile.jar with the signed JAR file.
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
--.LP
--.SS
--Keystore Location
--.LP
--.LP
--\f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory.
--.LP
--.LP
--Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device.
--.LP
--.SS
--Keystore Implementation
--.LP
--.LP
--The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
--.LP
--.LP
--Currently, there are two command\-line tools that make use of keystore implementations (\f3keytool\fP and \f3jarsigner\fP), and also a GUI\-based tool named \f3Policy Tool\fP. Since \f2KeyStore\fP is publicly available, Java 2 SDK users can write additional security applications that use it.
--.LP
--.LP
--There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
--.LP
--.LP
--Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a provider and supply a KeystoreSpi subclass implementation, as described in
--.na
--\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
--.LP
--.LP
--Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
--.LP
--.LP
--\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
--.LP
--.LP
--For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu.
--.LP
--.LP
--If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the SDK security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
--.LP
--.LP
--Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
--.LP
--.LP
--The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
--.LP
--.nf
--\f3
--.fl
-- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file:
--.LP
--.nf
--\f3
--.fl
-- keystore.type=jks
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: Case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
--.LP
--.LP
--To have the tools utilize a keystore implementation other than the default, change that line to specify a different keystore type. For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
--.LP
--.nf
--\f3
--.fl
-- keystore.type=pkcs12
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that if you us the PKCS#11 provider package, you should refer to the
--.na
--\f2KeyTool and JarSigner\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
--.LP
--.SS
--Supported Algorithms
--.LP
--.LP
--By default, \f3jarsigner\fP signs a JAR file using one of the following:
--.LP
--.RS 3
--.TP 2
--o
--DSA (Digital Signature Algorithm) with the SHA1 digest algorithm
--.TP 2
--o
--RSA algorithm with the SHA256 digest algorithm.
--.TP 2
--o
--EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm).
--.RE
--
--.LP
--.LP
--That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm.
--.LP
--.LP
--These default signature algorithms can be overridden using the \f2\-sigalg\fP option.
--.LP
--.SS
--The Signed JAR File
--.LP
--.LP
--When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory:
--.LP
--.RS 3
--.TP 2
--o
--a signature file, with a .SF extension, and
--.TP 2
--o
--a signature block file, with a .DSA, .RSA, or .EC extension.
--.RE
--
--.LP
--.LP
--The base file names for these two files come from the value of the \f2\-sigFile\fP option. For example, if the option appears as
--.LP
--.nf
--\f3
--.fl
--\-sigFile MKSIGN
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The files are named "MKSIGN.SF" and "MKSIGN.DSA".
--.LP
--.LP
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens.
--.LP
--\f3The Signature (.SF) File\fP
--.LP
--.LP
--A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following:
--.LP
--.RS 3
--.TP 2
--o
--the file name,
--.TP 2
--o
--the name of the digest algorithm used (SHA), and
--.TP 2
--o
--a SHA digest value.
--.RE
--
--.LP
--.LP
--In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file. In the .SF file, on the other hand, the digest value for a given source file is the hash of the three lines in the manifest file for the source file.
--.LP
--.LP
--The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification.
--.LP
--\f3The Signature Block File\fP
--.LP
--The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used.
--.SS
--Signature Timestamp
--.LP
--.LP
--\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
--.LP
--.RS 3
--.TP 2
--o
--\f2\-tsa url\fP
--.TP 2
--o
--\f2\-tsacert alias\fP
--.TP 2
--o
--\f2\-altsigner class\fP
--.TP 2
--o
--\f2\-altsignerpath classpathlist\fP
--.RE
--
--.LP
--.LP
--Each of these options is detailed in the Options section below.
--.LP
--.SS
--JAR File Verification
--.LP
--.LP
--A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps:
--.LP
--.RS 3
--.TP 3
--1.
--Verify the signature of the .SF file itself.
--.br
--.br
--That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
--.TP 3
--2.
--Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
--.br
--.br
--The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
--.br
--.br
--If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
--.br
--.br
--One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
--.TP 3
--3.
--Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails.
--.RE
--
--.LP
--.LP
--If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP.
--.LP
--.SS
--Multiple Signatures for a JAR File
--.LP
--.LP
--A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner myBundle.jar susan
--.fl
-- jarsigner myBundle.jar kevin
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When a JAR file is signed multiple times, there are multiple .SF and .DSA files in the resulting JAR file, one pair for each signature. Thus, in the example above, the output JAR file includes files with the following names:
--.LP
--.nf
--\f3
--.fl
-- SUSAN.SF
--.fl
-- SUSAN.DSA
--.fl
-- KEVIN.SF
--.fl
-- KEVIN.DSA
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP.
--.LP
--.SH "OPTIONS"
--.LP
--.LP
--The various \f3jarsigner\fP options are listed and described below. Note:
--.LP
--.RS 3
--.TP 2
--o
--All option names are preceded by a minus sign (\-).
--.TP 2
--o
--The options may be provided in any order.
--.TP 2
--o
--Items in italics (option values) represent the actual values that must be supplied.
--.TP 2
--o
--The \f2\-keystore\fP, \f2\-storepass\fP, \f2\-keypass\fP, \f2\-sigfile\fP, \f2\-sigalg\fP, \f2\-digestalg\fP, and \f2\-signedjar\fP options are only relevant when signing a JAR file, not when verifying a signed JAR file. Similarly, an alias is only specified on the command line when signing a JAR file.
--.RE
--
--.LP
--.RS 3
--.TP 3
--\-keystore url
--Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
--.br
--.br
--A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
--.br
--.br
--A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
--.br
--.br
--Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is,
--.nf
--\f3
--.fl
-- \-keystore \fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--is treated as equivalent to
--.nf
--\f3
--.fl
-- \-keystore file:\fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--If the Sun PKCS#11 provider has been configured in the \f2java.security\fP security properties file (located in the JRE's \f2$JAVA_HOME/lib/security\fP directory), then keytool and jarsigner can operate on the PKCS#11 token by specifying these options:
--.RS 3
--.TP 2
--o
--\f2\-keystore NONE\fP
--.TP 2
--o
--\f2\-storetype PKCS11\fP
--.RE
--For example, this command lists the contents of the configured PKCS#11 token:
--.nf
--\f3
--.fl
-- jarsigner \-keystore NONE \-storetype PKCS11 \-list
--.fl
--\fP
--.fi
--.TP 3
--\-storetype storetype
--Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
--.br
--.br
--The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
--.TP 3
--\-storepass[:env | :file] argument
--Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-keypass[:env | :file] argument
--Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-sigfile file
--Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
--.br
--.br
--The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
--.br
--.br
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
--.TP 3
--\-sigalg algorithm
--Specifies the name of the signature algorithm to use to sign the JAR file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-digestalg algorithm
--Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-signedjar file
--Specifies the name to be used for the signed JAR file.
--.br
--.br
--If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
--.TP 3
--\-verify
--If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
--.br
--.br
--It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
--.br
--.br
--For further information on verification, see JAR File Verification.
--.TP 3
--\-certs
--If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes
--.RS 3
--.TP 2
--o
--the name of the type of certificate (stored in the .DSA file) that certifies the signer's public key
--.TP 2
--o
--if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer
--.RE
--The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed:
--.RS 3
--.TP 2
--o
--in parentheses, the alias name for the keystore entry for that signer. If the signer actually comes from a JDK 1.1 identity database instead of from a keystore, the alias name will appear in brackets instead of parentheses.
--.RE
--.TP 3
--\-certchain file
--Specifies the certificate chain to be used, if the certificate chain associated with the private key of the keystore entry, addressed by the alias specified on the command line, is not complete. This may happen if the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain. The file can be a sequence of X.509 certificates concatenated together, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as BASE64 encoding) as defined by the Internet RFC 1421 standard.
--.TP 3
--\-verbose
--If this appears on the command line, it indicates "verbose" mode, which causes \f3jarsigner\fP to output extra information as to the progress of the JAR signing or verification.
--.TP 3
--\-internalsf
--In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-sectionsonly
--If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
--.br
--.br
--By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
--.br
--.br
--For further information, see JAR File Verification.
--.br
--.br
--\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-protected
--Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
--.TP 3
--\-providerClass provider\-class\-name
--Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
--.br
--.br
--Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file.
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerClass sun.security.pkcs11.SunPKCS11 \\
--.fl
-- \-providerArg /foo/bar/token.config \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-providerName providerName
--If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
--.br
--.br
--For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the
--.na
--\f2configuration attributes table\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerName SunPKCS11\-SmartCard \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-Jjavaoption
--Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
--.TP 3
--\-tsa url
--If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
--.br
--.br
--To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in
--.na
--\f2RFC 3161\fP @
--.fi
--http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
--.TP 3
--\-tsacert alias
--If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
--.br
--.br
--The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
--.TP 3
--\-altsigner class
--Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
--.br
--.br
--For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
--.TP 3
--\-altsignerpath classpathlist
--Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
--.br
--.br
--An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
--.br
--.br
--Example of specifying the path to a jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/lib/authsigner.jar
--.fl
--\fP
--.fi
--Note that the JAR file name is included.
--.br
--.br
--Example of specifying the path to the jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
--.fl
--\fP
--.fi
--Note that the JAR file name is omitted.
--.TP 3
--\-strict
--During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details.
--.TP 3
--\-verbose:sub\-options
--For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information.
--.RE
--
--.LP
--.SH "EXAMPLES"
--.LP
--.SS
--Signing a JAR File
--.LP
--.LP
--Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that there is no \f2\-sigfile\fP specified in the command above, so the generated .SF and .DSA files to be placed in the signed JAR file will have default names based on the alias name. That is, they will be named \f2JANE.SF\fP and \f2JANE.DSA\fP.
--.LP
--.LP
--If you want to be prompted for the store password and the private key password, you could shorten the above command to
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore
--.fl
-- \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the keystore to be used is the default keystore (the one named ".keystore" in your home directory), you don't need to specify a keystore, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Finally, if you want the signed JAR file to simply overwrite the input JAR file (\f2bundle.jar\fP), you don't need to specify a \f2\-signedjar\fP option:
--.LP
--.nf
--\f3
--.fl
-- jarsigner bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verifying a Signed JAR File
--.LP
--.LP
--To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify sbundle.jar
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the verification is successful,
--.LP
--.nf
--\f3
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--is displayed. Otherwise, an error message appears.
--.LP
--.LP
--You can get more information if you use the \f2\-verbose\fP option. A sample use of \f3jarsigner\fP with the \f2\-verbose\fP option is shown below, along with sample output:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify \-verbose sbundle.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx.class
--.fl
-- smk 849 Fri Sep 26 16:12:46 PDT 1997 test.class
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification with Certificate Information
--.LP
--.LP
--If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.SF
--.fl
-- 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst.class
--.fl
--
--.fl
-- X.509, CN=Test Group, OU=Java Software, O=Sun Microsystems, L=CUP, S=CA, C=US (javatest)
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the certificate for a signer is not an X.509 certificate, there is no distinguished name information. In that case, just the certificate type and the alias are shown. For example, if the certificate is a PGP certificate, and the alias is "bob", you'd get
--.LP
--.nf
--\f3
--.fl
-- PGP, (bob)
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification of a JAR File that Includes Identity Database Signers
--.LP
--.LP
--If a JAR file has been signed using the JDK 1.1 \f3javakey\fP tool, and thus the signer is an alias in an identity database, the verification output includes an "i" symbol. If the JAR file has been signed by both an alias in an identity database and an alias in a keystore, both "k" and "i" appear.
--.LP
--.LP
--When the \f2\-certs\fP option is used, any identity database aliases are shown in square brackets rather than the parentheses used for keystore aliases. For example:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.SF
--.fl
-- 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.DSA
--.fl
-- smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile.html
--.fl
--
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
-- X.509, CN=Duke, OU=Java Software, O=Sun, L=cup, S=ca, C=us [duke]
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
-- i = at least one certificate was found in identity scope
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias.
--.LP
--.SH "WARNINGS"
--.LP
--During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows:
--.nf
--\f3
--.fl
-- hasExpiringCert 2
--.fl
-- This jar contains entries whose signer certificate will expire within six months
--.fl
--
--.fl
-- hasExpiredCert 4
--.fl
-- This jar contains entries whose signer certificate has expired.
--.fl
--
--.fl
-- notYetValidCert 4
--.fl
-- This jar contains entries whose signer certificate is not yet valid.
--.fl
--
--.fl
-- chainNotValidated 4
--.fl
-- This jar contains entries whose certificate chain cannot be correctly validated.
--.fl
--
--.fl
-- badKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--.fl
--
--.fl
-- badExtendedKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's ExtendedKeyUsage extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- badNetscapeCertType 8
--.fl
-- This jar contains entries whose signer certificate's NetscapeCertType extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- hasUnsignedEntry 16
--.fl
-- This jar contains unsigned entries which have not been integrity\-checked.
--.fl
--
--.fl
-- notSignedByAlias 32
--.fl
-- This jar contains signed entries which are not signed by the specified alias(es)
--.fl
--
--.fl
-- aliasNotInStore 32
--.fl
-- This jar contains signed entries that are not signed by alias in this keystore
--.fl
--
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned.
--.LP
--.LP
--\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned:
--.LP
--.nf
--\f3
--.fl
--failure 1
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Compatibility with JDK 1.1
--.LP
--.LP
--The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them.
--.LP
--.LP
--The new keystore architecture replaces the identity database that \f3javakey\fP created and managed. There is no backwards compatibility between the keystore format and the database format used by \f3javakey\fP in 1.1. However,
--.LP
--.RS 3
--.TP 2
--o
--It is possible to import the information from an identity database into a keystore, via the \f3keytool\fP \f2\-identitydb\fP command.
--.TP 2
--o
--\f3jarsigner\fP can sign JAR files also previously signed using \f3javakey\fP.
--.TP 2
--o
--\f3jarsigner\fP can verify JAR files signed using \f3javakey\fP. Thus, it recognizes and can work with signer aliases that are from a JDK 1.1 identity database rather than a Java 2 SDK keystore.
--.RE
--
--.LP
--.LP
--The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform.
--.LP
--.LP
--.TS
--.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
--.de 35
--.ps \n(.s
--.vs \n(.vu
--.in \n(.iu
--.if \n(.u .fi
--.if \n(.j .ad
--.if \n(.j=0 .na
--..
--.nf
--.nr #~ 0
--.if n .nr #~ 0.6n
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.fc
--.nr 33 \n(.s
--.rm 80 81 82 83 84
--.nr 34 \n(.lu
--.eo
--.am 82
--.br
--.di a+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(82 .ll \n(82u
--.in 0
--\f3Trusted Identity imported into Java 2 Platform keystore from 1.1 database (4)\fP
--.br
--.di
--.nr a| \n(dn
--.nr a- \n(dl
--..
--.ec \
--.eo
--.am 83
--.br
--.di b+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(83 .ll \n(83u
--.in 0
--\f3Policy File grants privileges to Identity/Alias\fP
--.br
--.di
--.nr b| \n(dn
--.nr b- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di c+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr c| \n(dn
--.nr c- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di d+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr d| \n(dn
--.nr d- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di e+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr e| \n(dn
--.nr e- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di f+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (3)
--.br
--.di
--.nr f| \n(dn
--.nr f- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di g+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (1,3)
--.br
--.di
--.nr g| \n(dn
--.nr g- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di h+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file.
--.br
--.di
--.nr h| \n(dn
--.nr h- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di i+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file. (2)
--.br
--.di
--.nr i| \n(dn
--.nr i- \n(dl
--..
--.ec \
--.35
--.nf
--.ll \n(34u
--.nr 80 0
--.nr 38 \w\f3JAR File Type\fP
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wUnsigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.80
--.rm 80
--.nr 81 0
--.nr 38 \w\f3Identity in 1.1 database\fP
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.81
--.rm 81
--.nr 82 0
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.82
--.rm 82
--.nr 38 \n(a-
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 83 0
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.83
--.rm 83
--.nr 38 \n(b-
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 84 0
--.nr 38 \w\f3Privileges Granted\fP
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.84
--.rm 84
--.nr 38 \n(c-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(d-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(e-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(f-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(g-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(h-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(i-
--.if \n(84<\n(38 .nr 84 \n(38
--.35
--.nf
--.ll \n(34u
--.nr 38 1n
--.nr 79 0
--.nr 40 \n(79+(0*\n(38)
--.nr 80 +\n(40
--.nr 41 \n(80+(3*\n(38)
--.nr 81 +\n(41
--.nr 42 \n(81+(3*\n(38)
--.nr 82 +\n(42
--.nr 43 \n(82+(3*\n(38)
--.nr 83 +\n(43
--.nr 44 \n(83+(3*\n(38)
--.nr 84 +\n(44
--.nr TW \n(84
--.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units
--.fc  
--.nr #T 0-1
--.nr #a 0-1
--.eo
--.de T#
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.mk ##
--.nr ## -1v
--.ls 1
--.ls
--..
--.ec
--.ne \n(a|u+\n(.Vu
--.ne \n(b|u+\n(.Vu
--.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'\f3JAR File Type\fP\h'|\n(41u'\f3Identity in 1.1 database\fP\h'|\n(42u'\h'|\n(43u'\h'|\n(44u'\f3Privileges Granted\fP
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(42u
--.in +\n(37u
--.a+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(43u
--.in +\n(37u
--.b+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(c|u+\n(.Vu
--.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.c+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(d|u+\n(.Vu
--.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Unsigned JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.d+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(e|u+\n(.Vu
--.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.e+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(f|u+\n(.Vu
--.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.f+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(g|u+\n(.Vu
--.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.g+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(h|u+\n(.Vu
--.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.h+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(i|u+\n(.Vu
--.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.i+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'All privileges
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'All privileges (1)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'All privileges (1)
--.fc
--.nr T. 1
--.T# 1
--.35
--.rm a+
--.rm b+
--.rm c+
--.rm d+
--.rm e+
--.rm f+
--.rm g+
--.rm h+
--.rm i+
--.TE
--.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
--
--.LP
--.LP
--Notes:
--.LP
--.RS 3
--.TP 3
--1.
--If an identity/alias is mentioned in the policy file, it must be imported into the keystore for the policy file to have any effect on privileges granted.
--.TP 3
--2.
--The policy file/keystore combination has precedence over a trusted identity in the identity database.
--.TP 3
--3.
--Untrusted identities are ignored in the Java 2 platform.
--.TP 3
--4.
--Only trusted identities can be imported into Java 2 SDK keystores.
--.RE
--
--.LP
--.SH "SEE ALSO"
--.LP
--.RS 3
--.TP 2
--o
--jar(1) tool documentation
--.TP 2
--o
--keytool(1) tool documentation
--.TP 2
--o
--the
--.na
--\f4Security\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/security/index.html trail of the
--.na
--\f4Java Tutorial\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
--.RE
--
--.LP
--
-+'\" t
-+.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-+.\"
-+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+.\"
-+.\" This code is free software; you can redistribute it and/or modify it
-+.\" under the terms of the GNU General Public License version 2 only, as
-+.\" published by the Free Software Foundation.
-+.\"
-+.\" 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.
-+.\"
-+.\" Arch: generic
-+.\" Software: JDK 7
-+.\" Date: 6 August 2013
-+.\" SectDesc: Security Tools
-+.\" Title: jarsigner.1
-+.\"
-+.if n .pl 99999
-+.TH jarsigner 1 "6 August 2013" "JDK 7" "Security Tools"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+
-+.SH NAME
-+jarsigner \- Signs and verifies Java Archive (JAR) files\&.
-+.SH SYNOPSIS
-+.sp
-+.nf
-+
-+\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
-+.fi
-+.nf
-+
-+\fBjarsigner\fR \fB\-verify\fR [ \fIoptions\fR ] \fIjar\-file\fR [\fIalias \&.\&.\&.\fR]
-+.fi
-+.sp
-+.TP
-+\fIoptions\fR
-+The command-line options\&. See Options\&.
-+.TP
-+-verify
-+.br
-+The \f3-verify\fR option can take zero or more keystore alias names after the JAR file name\&. When the \f3-verify\fR option is specified, the \f3jarsigner\fR command checks that the certificate used to verify each signed entry in the JAR file matches one of the keystore aliases\&. The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar verified, with signer errors" is displayed\&.
-+.TP
-+\fIjar-file\fR
-+The JAR file to be signed\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar signed, with signer errors" is displayed\&.
-+.TP
-+\fIalias\fR
-+The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+.SH DESCRIPTION
-+The \f3jarsigner\fR tool has two purposes:
-+.TP 0.2i
-+\(bu
-+To sign Java Archive (JAR) files\&.
-+.TP 0.2i
-+\(bu
-+To verify the signatures and integrity of signed JAR files\&.
-+.PP
-+The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution\&. A tool named \f3jar\fR enables developers to produce JAR files\&. (Technically, any zip file can also be considered a JAR file, although when created by the \f3jar\fR command or processed by the \f3jarsigner\fR command, JAR files also contain a \f3META-INF/MANIFEST\&.MF\fR file\&.)
-+.PP
-+A digital signature is a string of bits that is computed from some data (the data being signed) and the private key of an entity (a person, company, and so on)\&. Similar to a handwritten signature, a digital signature has many useful characteristics:
-+.TP 0.2i
-+\(bu
-+Its authenticity can be verified by a computation that uses the public key corresponding to the private key used to generate the signature\&.
-+.TP 0.2i
-+\(bu
-+It cannot be forged, assuming the private key is kept secret\&.
-+.TP 0.2i
-+\(bu
-+It is a function of the data signed and thus cannot be claimed to be the signature for other data as well\&.
-+.TP 0.2i
-+\(bu
-+The signed data cannot be changed\&. If the data is changed, then the signature cannot be verified as authentic\&.
-+.PP
-+To generate an entity\&'s signature for a file, the entity must first have a public/private key pair associated with it and one or more certificates that authenticate its public key\&. A certificate is a digitally signed statement from one entity that says that the public key of another entity has a particular value\&.
-+.PP
-+The \f3jarsigner\fR command uses key and certificate information from a keystore to generate digital signatures for JAR files\&. A keystore is a database of private keys and their associated X\&.509 certificate chains that authenticate the corresponding public keys\&. The \f3keytool\fR command is used to create and administer keystores\&.
-+.PP
-+The \f3jarsigner\fR command uses an entity\&'s private key to generate a signature\&. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file\&. The \f3jarsigner\fR command can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file)\&.
-+.PP
-+The \f3jarsigner\fR command can generate signatures that include a time stamp that lets a systems or deployer (including Java Plug-in) to check whether the JAR file was signed while the signing certificate was still valid\&. In addition, APIs allow applications to obtain the timestamp information\&.
-+.PP
-+At this time, the \f3jarsigner\fR command can only sign JAR files created by the \f3jar\fR command or zip files\&. JAR files are the same as zip files, except they also have a \f3META-INF/MANIFEST\&.MF\fR file\&. A \f3META-INF/MANIFEST\&.MF\fR file is created when the \f3jarsigner\fR command signs a zip file\&.
-+.PP
-+The default \f3jarsigner\fR command behavior is to sign a JAR or zip file\&. Use the \f3-verify\fR option to verify a signed JAR file\&.
-+.PP
-+The \f3jarsigner\fR command also attempts to validate the signer\&'s certificate after signing or verifying\&. If there is a validation error or any other problem, the command generates warning messages\&. If you specify the \f3-strict\fR option, then the command treats severe warnings as errors\&. See Errors and Warnings\&.
-+.SS KEYSTORE\ ALIASES
-+All keystore entities are accessed with unique aliases\&.
-+.PP
-+When you use the \f3jarsigner\fR command to sign a JAR file, you must specify the alias for the keystore entry that contains the private key needed to generate the signature\&. For example, the following command signs the JAR file named \f3MyJARFile\&.jar\fR with the private key associated with the alias \f3duke\fR in the keystore named \f3mystore\fR in the \f3working\fR directory\&. Because no output file is specified, it overwrites \f3MyJARFile\&.jar\fR with the signed JAR file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password> MyJARFile\&.jar duke\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Keystores are protected with a password, so the store password must be specified\&. You are prompted for it when you do not specify it on the command line\&. Similarly, private keys are protected in a keystore with a password, so the private key\&'s password must be specified, and you are prompted for the password when you do not specify it on the command line and it is not the same as the store password\&.
-+.SS KEYSTORE\ LOCATION
-+The \f3jarsigner\fR command has a \f3-keystore\fR option for specifying the URL of the keystore to be used\&. The keystore is by default stored in a file named \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+.PP
-+On Oracle Solaris systems, \f3user\&.home\fR defaults to the user\&'s home directory\&.
-+.PP
-+The input stream from the \f3-keystore\fR option is passed to the \f3KeyStore\&.load\fR method\&. If \f3NONE\fR is specified as the URL, then a null stream is passed to the \f3KeyStore\&.load\fR method\&. \f3NONE\fR should be specified when the \f3KeyStore\fR class is not file based, for example, when it resides on a hardware token device\&.
-+.SS KEYSTORE\ IMPLEMENTATION
-+The \f3KeyStore\fR class provided in the \f3java\&.security\fR package supplies a number of well-defined interfaces to access and modify the information in a keystore\&. You can have multiple different concrete implementations, where each implementation is for a particular type of keystore\&.
-+.PP
-+Currently, there are two command-line tools that use keystore implementations (\f3keytool\fR and \f3jarsigner\fR), and a GUI-based tool named Policy Tool\&. Because the \f3KeyStore\fR class is publicly available, JDK users can write additional security applications that use it\&.
-+.PP
-+There is a built-in default implementation provided by Oracle that implements the keystore as a file, that uses a proprietary keystore type (format) named JKS\&. The built-in implementation protects each private key with its individual password and protects the integrity of the entire keystore with a (possibly different) password\&.
-+.PP
-+Keystore implementations are provider-based, which means the application interfaces supplied by the \f3KeyStore\fR class are implemented in terms of a Service Provider Interface (SPI)\&. There is a corresponding abstract \f3KeystoreSpi\fR class, also in the \f3java\&.security package\fR, that defines the Service Provider Interface methods that providers must implement\&. The term provider refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API\&. To provide a keystore implementation, clients must implement a provider and supply a \f3KeystoreSpi\fR subclass implementation, as described in How to Implement a Provider in the Java Cryptography Architecture at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider\&.html
-+.PP
-+Applications can choose different types of keystore implementations from different providers, with the \f3getInstance\fR factory method in the \f3KeyStore\fR class\&. A keystore type defines the storage and data format of the keystore information and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself\&. Keystore implementations of different types are not compatible\&.
-+.PP
-+The \f3jarsigner\fR and \f3policytool\fR commands can read file-based keystores from any location that can be specified using a URL\&. In addition, these commands can read non-file-based keystores such as those provided by MSCAPI on Windows and PKCS11 on all platforms\&.
-+.PP
-+For the \f3jarsigner\fR and \f3keytool\fR commands, you can specify a keystore type at the command line with the \f3-storetype\fR option\&. For Policy Tool, you can specify a keystore type with the \fIEdit\fR command in the \fIKeyStore\fR menu\&.
-+.PP
-+If you do not explicitly specify a keystore type, then the tools choose a keystore implementation based on the value of the \f3keystore\&.type\fR property specified in the security properties file\&. The security properties file is called \f3java\&.security\fR, and it resides in the JDK security properties directory, \f3java\&.home/lib/security\fR, where \f3java\&.home\fR is the runtime environment\&'s directory\&. The \f3jre\fR directory in the JDK or the top-level directory of the Java Runtime Environment (JRE)\&.
-+.PP
-+Each tool gets the \f3keystore\&.type\fR value and then examines all the installed providers until it finds one that implements keystores of that type\&. It then uses the keystore implementation from that provider\&.
-+.PP
-+The \f3KeyStore\fR class defines a static method named \f3getDefaultType\fR that lets applications and applets retrieve the value of the \f3keystore\&.type\fR property\&. The following line of code creates an instance of the default keystore type as specified in the \f3keystore\&.type property\fR:
-+.sp
-+.nf
-+\f3KeyStore keyStore = KeyStore\&.getInstance(KeyStore\&.getDefaultType());\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+The default keystore type is \f3jks\fR (the proprietary type of the keystore implementation provided by Oracle)\&. This is specified by the following line in the security properties file:
-+.sp
-+.nf
-+\f3keystore\&.type=jks\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Case does not matter in keystore type designations\&. For example, \f3JKS\fR is the same as \f3jks\fR\&.
-+.PP
-+To have the tools use a keystore implementation other than the default, change that line to specify a different keystore type\&. For example, if you have a provider package that supplies a keystore implementation for a keystore type called \f3pkcs12\fR, then change the line to the following:
-+.sp
-+.nf
-+\f3keystore\&.type=pkcs12\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR If you use the PKCS 11 provider package, then see "KeyTool" and "JarSigner" in Java PKCS #11 Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/p11guide\&.html
-+.SS SUPPORTED\ ALGORITHMS
-+By default, the \f3jarsigner\fR command signs a JAR file using one of the following algorithms:
-+.TP 0.2i
-+\(bu
-+Digital Signature Algorithm (DSA) with the SHA1 digest algorithm
-+.TP 0.2i
-+\(bu
-+RSA algorithm with the SHA256 digest algorithm
-+.TP 0.2i
-+\(bu
-+Elliptic Curve (EC) cryptography algorithm with the SHA256 with Elliptic Curve Digital Signature Algorithm (ECDSA)\&.
-+.PP
-+If the signer\&'s public and private keys are DSA keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA1withDSA\fR algorithm\&. If the signer\&'s keys are RSA keys, then \f3jarsigner\fR attempts to sign the JAR file with the \f3SHA256withRSA\fR algorithm\&. If the signer\&'s keys are EC keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA256withECDSA\fR algorithm\&.
-+.PP
-+These default signature algorithms can be overridden using the \f3-sigalg\fR option\&.
-+.SS THE\ SIGNED\ JAR\ FILE
-+When the \f3jarsigner\fR command is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META-INF directory:
-+.TP 0.2i
-+\(bu
-+A signature file with an \f3\&.SF\fR extension
-+.TP 0.2i
-+\(bu
-+A signature block file with a \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR extension
-+.PP
-+The base file names for these two files come from the value of the \f3-sigFile\fR option\&. For example, when the option is \f3-sigFile MKSIGN\fR, the files are named \f3MKSIGN\&.SF\fR and \f3MKSIGN\&.DSA\fR
-+.PP
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to uppercase\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not allowed in a signature file name, then each such character is converted to an underscore (_) character in forming the file name\&. Valid characters include letters, digits, underscores, and hyphens\&.
-+.PP
-+Signature File
-+
-+A signature file (\f3\&.SF\fR file) looks similar to the manifest file that is always included in a JAR file when the \f3jarsigner\fR command is used to sign the file\&. For each source file included in the JAR file, the \f3\&.SF\fR file has three lines, such as in the manifest file, that list the following:
-+.TP 0.2i
-+\(bu
-+File name
-+.TP 0.2i
-+\(bu
-+Name of the digest algorithm (SHA)
-+.TP 0.2i
-+\(bu
-+SHA digest value
-+.PP
-+In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file\&. In the \f3\&.SF\fR file, the digest value for a specified source file is the hash of the three lines in the manifest file for the source file\&.
-+.PP
-+The signature file, by default, includes a header with a hash of the whole manifest file\&. The header also contains a hash of the manifest header\&. The presence of the header enables verification optimization\&. See JAR File Verification\&.
-+.PP
-+Signature Block File
-+
-+The \f3\&.SF\fR file is signed and the signature is placed in the signature block file\&. This file also contains, encoded inside it, the certificate or certificate chain from the keystore that authenticates the public key corresponding to the private key used for signing\&. The file has the extension \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR, depending on the digest algorithm used\&.
-+.SS SIGNATURE\ TIME\ STAMP
-+The \f3jarsigner\fR command can generate and store a signature time stamp when signing a JAR file\&. In addition, \f3jarsigner\fR supports alternative signing mechanisms\&. This behavior is optional and is controlled by the user at the time of signing through these options\&. See Options\&.
-+.sp
-+.nf
-+\f3\-tsa \fIurl\fR\fP
-+.fi
-+.nf
-+\f3\-tsacert \fIalias\fR\fP
-+.fi
-+.nf
-+\f3\-altsigner \fIclass\fR\fP
-+.fi
-+.nf
-+\f3\-altsignerpath \fIclasspathlist\fR\fP
-+.fi
-+.nf
-+\f3\-tsapolicyid \fIpolicyid\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS JAR\ FILE\ VERIFICATION
-+A successful JAR file verification occurs when the signatures are valid, and none of the files that were in the JAR file when the signatures were generated have changed since then\&. JAR file verification involves the following steps:
-+.TP 0.4i
-+1\&.
-+Verify the signature of the \f3\&.SF\fR file\&.
-+
-+The verification ensures that the signature stored in each signature block (\f3\&.DSA\fR) file was generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the \f3\&.DSA\fR file\&. It also ensures that the signature is a valid signature of the corresponding signature (\f3\&.SF\fR) file, and thus the \f3\&.SF\fR file was not tampered with\&.
-+.TP 0.4i
-+2\&.
-+Verify the digest listed in each entry in the \f3\&.SF\fR file with each corresponding section in the manifest\&.
-+
-+The \f3\&.SF\fR file by default includes a header that contains a hash of the entire manifest file\&. When the header is present, the verification can check to see whether or not the hash in the header matches the hash of the manifest file\&. If there is a match, then verification proceeds to the next step\&.
-+
-+If there is no match, then a less optimized verification is required to ensure that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See Signature File\&.
-+
-+One reason the hash of the manifest file that is stored in the \f3\&.SF\fR file header might not equal the hash of the current manifest file is that one or more files were added to the JAR file (with the \f3jar\fR tool) after the signature and \f3\&.SF\fR file were generated\&. When the \f3jar\fR tool is used to add files, the manifest file is changed by adding sections to it for the new files, but the \f3\&.SF\fR file is not changed\&. A verification is still considered successful when none of the files that were in the JAR file when the signature was generated have been changed since then\&. This happens when the hashes in the non-header sections of the \f3\&.SF\fR file equal the hashes of the corresponding sections in the manifest file\&.
-+.TP 0.4i
-+3\&.
-+Read each file in the JAR file that has an entry in the \f3\&.SF\fR file\&. While reading, compute the file\&'s digest and compare the result with the digest for this file in the manifest section\&. The digests should be the same or verification fails\&.
-+
-+If any serious verification failures occur during the verification process, then the process is stopped and a security exception is thrown\&. The \f3jarsigner\fR command catches and displays the exception\&.
-+.PP
-+\fINote:\fR You should read any addition warnings (or errors if you specified the \f3-strict\fR option), as well as the content of the certificate (by specifying the \f3-verbose\fR and \f3-certs\fR options) to determine if the signature can be trusted\&.
-+.SS MULTIPLE\ SIGNATURES\ FOR\ A\ JAR\ FILE
-+A JAR file can be signed by multiple people by running the \f3jarsigner\fR command on the file multiple times and specifying the alias for a different person each time, as follows:
-+.sp
-+.nf
-+\f3jarsigner myBundle\&.jar susan\fP
-+.fi
-+.nf
-+\f3jarsigner myBundle\&.jar kevin\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When a JAR file is signed multiple times, there are multiple \f3\&.SF\fR and \f3\&.DSA\fR files in the resulting JAR file, one pair for each signature\&. In the previous example, the output JAR file includes files with the following names:
-+.sp
-+.nf
-+\f3SUSAN\&.SF\fP
-+.fi
-+.nf
-+\f3SUSAN\&.DSA\fP
-+.fi
-+.nf
-+\f3KEVIN\&.SF\fP
-+.fi
-+.nf
-+\f3KEVIN\&.DSA\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&.
-+.SH OPTIONS
-+The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards:
-+.TP 0.2i
-+\(bu
-+All option names are preceded by a minus sign (-)\&.
-+.TP 0.2i
-+\(bu
-+The options can be provided in any order\&.
-+.TP 0.2i
-+\(bu
-+Items that are in italics or underlined (option values) represent the actual values that must be supplied\&.
-+.TP 0.2i
-+\(bu
-+The \f3-storepass\fR, \f3-keypass\fR, \f3-sigfile\fR, \f3-sigalg\fR, \f3-digestalg\fR, \f3-signedjar\fR, and TSA-related options are only relevant when signing a JAR file; they are not relevant when verifying a signed JAR file\&. The \f3-keystore\fR option is relevant for signing and verifying a JAR file\&. In addition, aliases are specified when signing and verifying a JAR file\&.
-+.TP
-+-keystore \fIurl\fR
-+.br
-+Specifies the URL that tells the keystore location\&. This defaults to the file \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+
-+A keystore is required when signing\&. You must explicitly specify a keystore when the default keystore does not exist or if you want to use one other than the default\&.
-+
-+A keystore is not required when verifying, but if one is specified or the default exists and the \f3-verbose\fR option was also specified, then additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore\&.
-+
-+The \f3-keystore\fR argument can be a file name and path specification rather than a URL, in which case it is treated the same as a file: URL, for example, the following are equivalent:
-+.sp
-+.nf
-+\f3\-keystore \fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\-keystore file:\fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+If the Sun PKCS #11 provider was configured in the \f3java\&.security\fR security properties file (located in the JRE\&'s \f3$JAVA_HOME/lib/security directory\fR), then the \f3keytool\fR and \f3jarsigner\fR tools can operate on the PKCS #11 token by specifying these options:
-+.sp
-+.nf
-+\f3\-keystore NONE\fP
-+.fi
-+.nf
-+\f3\-storetype PKCS11\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+For example, the following command lists the contents of the configured PKCS#11 token:
-+.sp
-+.nf
-+\f3keytool \-keystore NONE \-storetype PKCS11 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-storetype \fIstoretype\fR
-+.br
-+Specifies the type of keystore to be instantiated\&. The default keystore type is the one that is specified as the value of the \f3keystore\&.type\fR property in the security properties file, which is returned by the static \f3getDefaultType\fR method in \f3java\&.security\&.KeyStore\fR\&.
-+
-+The PIN for a PCKS #11 token can also be specified with the \f3-storepass\fR option\&. If none is specified, then the \f3keytool\fR and \f3jarsigner\fR commands prompt for the token PIN\&. If the token has a protected authentication path (such as a dedicated PIN-pad or a biometric reader), then the \f3-protected\fR option must be specified and no password options can be specified\&.
-+.TP
-+-storepass[:env | :file] \fIargument\fR
-+.br
-+Specifies the password that is required to access the keystore\&. This is only needed when signing (not verifying) a JAR file\&. In that case, if a \f3-storepass\fR option is not provided at the command line, then the user is prompted for the password\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \fIargument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-keypass [:env | :file] \fIargument\fR
-+.br
-+Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line\&. The password is required when using \f3jarsigner\fR to sign a JAR file\&. If no password is provided on the command line, and the required password is different from the store password, then the user is prompted for it\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \f3argument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-sigfile \fIfile\fR
-+.br
-+Specifies the base file name to be used for the generated \f3\&.SF\fR and \f3\&.DSA\fR files\&. For example, if file is \f3DUKESIGN\fR, then the generated \f3\&.SF\fR and \f3\&.DSA\fR files are named \f3DUKESIGN\&.SF\fR and \f3DUKESIGN\&.DSA\fR, and placed in the \f3META-INF\fR directory of the signed JAR file\&.
-+
-+The characters in the file must come from the set \f3a-zA-Z0-9_-\fR\&. Only letters, numbers, underscore, and hyphen characters are allowed\&. All lowercase characters are converted to uppercase for the \f3\&.SF\fR and \f3\&.DSA\fR file names\&.
-+
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to upper case\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not valid in a signature file name, then each such character is converted to an underscore (_) character to form the file name\&.
-+.TP
-+-sigalg \fIalgorithm\fR
-+.br
-+Specifies the name of the signature algorithm to use to sign the JAR file\&.
-+
-+For a list of standard signature algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+This algorithm must be compatible with the private key used to sign the JAR file\&. If this option is not specified, then \f3SHA1withDSA\fR, \f3SHA256withRSA\fR, or \f3SHA256withECDSA\fR are used depending on the type of private key\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-digestalg \fIalgorithm\fR
-+.br
-+Specifies the name of the message digest algorithm to use when digesting the entries of a JAR file\&.
-+
-+For a list of standard message digest algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+If this option is not specified, then \f3SHA256\fR is used\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-certs
-+.br
-+If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&.
-+
-+The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&.
-+.TP
-+-certchain \fIfile\fR
-+.br
-+Specifies the certificate chain to be used when the certificate chain associated with the private key of the keystore entry that is addressed by the alias specified on the command line is not complete\&. This can happen when the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain\&. The file can be a sequence of concatenated X\&.509 certificates, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard\&. See the section Internet RFC 1421 Certificate Encoding Standard in \f3keytool\fR and http://tools\&.ietf\&.org/html/rfc1421\&.
-+.TP
-+-verbose
-+.br
-+When the \f3-verbose\fR option appears on the command line, it indicates verbose mode, which causes \f3jarsigner\fR to output extra information about the progress of the JAR signing or verification\&.
-+.TP
-+-internalsf
-+.br
-+In the past, the \f3\&.DSA\fR (signature block) file generated when a JAR file was signed included a complete encoded copy of the \f3\&.SF\fR file (signature file) also generated\&. This behavior has been changed\&. To reduce the overall size of the output JAR file, the \f3\&.DSA\fR file by default does not contain a copy of the \f3\&.SF\fR file anymore\&. If \f3-internalsf\fR appears on the command line, then the old behavior is utilized\&. This option is useful for testing\&. In practice, do not use the \f3-internalsf\fR option because it incurs higher overhead\&.
-+.TP
-+-sectionsonly
-+.br
-+If the \f3-sectionsonly\fR option appears on the command line, then the \f3\&.SF\fR file (signature file) generated when a JAR file is signed does not include a header that contains a hash of the whole manifest file\&. It contains only the information and hashes related to each individual source file included in the JAR file\&. See Signature File\&.
-+
-+By default, this header is added, as an optimization\&. When the header is present, whenever the JAR file is verified, the verification can first check to see whether the hash in the header matches the hash of the whole manifest file\&. When there is a match, verification proceeds to the next step\&. When there is no match, it is necessary to do a less optimized verification that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See JAR File Verification\&.
-+
-+The \f3-sectionsonly\fR option is primarily used for testing\&. It should not be used other than for testing because using it incurs higher overhead\&.
-+.TP
-+-protected
-+.br
-+Values can be either \f3true\fR or \f3false\fR\&. Specify \f3true\fR when a password must be specified through a protected authentication path such as a dedicated PIN reader\&.
-+.TP
-+-providerClass \fIprovider-class-name\fR
-+.br
-+Used to specify the name of cryptographic service provider\&'s master class file when the service provider is not listed in the \f3java\&.security\fR security properties file\&.
-+
-+Used with the \f3-providerArg ConfigFilePath\fR option, the \f3keytool\fR and \f3jarsigner\fR tools install the provider dynamically and use \fIConfigFilePath\fR for the path to the token configuration file\&. The following example shows a command to list a \f3PKCS #11\fR keystore when the Oracle PKCS #11 provider was not configured in the security properties file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerClass sun\&.security\&.pkcs11\&.SunPKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerArg /mydir1/mydir2/token\&.config \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-providerName \fIproviderName\fR
-+.br
-+If more than one provider was configured in the \f3java\&.security\fR security properties file, then you can use the \f3-providerName\fR option to target a specific provider instance\&. The argument to this option is the name of the provider\&.
-+
-+For the Oracle PKCS #11 provider, \fIproviderName\fR is of the form \f3SunPKCS11-\fR\fITokenName\fR, where \fITokenName\fR is the name suffix that the provider instance has been configured with, as detailed in the configuration attributes table\&. For example, the following command lists the contents of the \f3PKCS #11\fR keystore provider instance with name suffix \f3SmartCard\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerName SunPKCS11\-SmartCard \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-J\fIjavaoption\fR
-+.br
-+Passes through the specified \fIjavaoption\fR string directly to the Java interpreter\&. The \f3jarsigner\fR command is a wrapper around the interpreter\&. This option should not contain any spaces\&. It is useful for adjusting the execution environment or memory usage\&. For a list of possible interpreter options, type \f3java -h\fR or \f3java -X\fR at the command line\&.
-+.TP
-+-tsa \fIurl\fR
-+.br
-+If \f3-tsa http://example\&.tsa\&.url\fR appears on the command line when signing a JAR file then a time stamp is generated for the signature\&. The URL, \f3http://example\&.tsa\&.url\fR, identifies the location of the Time Stamping Authority (TSA) and overrides any URL found with the \f3-tsacert\fR option\&. The \f3-tsa\fR option does not require the TSA public key certificate to be present in the keystore\&.
-+
-+To generate the time stamp, \f3jarsigner\fR communicates with the TSA with the Time-Stamp Protocol (TSP) defined in RFC 3161\&. When successful, the time stamp token returned by the TSA is stored with the signature in the signature block file\&.
-+.TP
-+-tsacert \fIalias\fR
-+.br
-+When \f3-tsacert alias\fR appears on the command line when signing a JAR file, a time stamp is generated for the signature\&. The alias identifies the TSA public key certificate in the keystore that is in effect\&. The entry\&'s certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA\&.
-+
-+The TSA public key certificate must be present in the keystore when using the \f3-tsacert\fR option\&.
-+.TP
-+-tsapolicyid \fIpolicyid\fR
-+.br
-+Specifies the object identifier (OID) that identifies the policy ID to be sent to the TSA server\&. If this option is not specified, no policy ID is sent and the TSA server will choose a default policy ID\&.
-+
-+Object identifiers are defined by X\&.696, which is an ITU Telecommunication Standardization Sector (ITU-T) standard\&. These identifiers are typically period-separated sets of non-negative digits like \f31\&.2\&.3\&.4\fR, for example\&.
-+.TP
-+-altsigner \fIclass\fR
-+.br
-+This option specifies an alternative signing mechanism\&. The fully qualified class name identifies a class file that extends the \f3com\&.sun\&.jarsigner\&.ContentSigner\fR abstract class\&. The path to this class file is defined by the \f3-altsignerpath\fR option\&. If the \f3-altsigner\fR option is used, then the \f3jarsigner\fR command uses the signing mechanism provided by the specified class\&. Otherwise, the \f3jarsigner\fR command uses its default signing mechanism\&.
-+
-+For example, to use the signing mechanism provided by a class named \f3com\&.sun\&.sun\&.jarsigner\&.AuthSigner\fR, use the jarsigner option \f3-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fR\&.
-+.TP
-+-altsignerpath \fIclasspathlist\fR
-+.br
-+Specifies the path to the class file and any JAR file it depends on\&. The class file name is specified with the \f3-altsigner\fR option\&. If the class file is in a JAR file, then this option specifies the path to that JAR file\&.
-+
-+An absolute path or a path relative to the current directory can be specified\&. If \fIclasspathlist\fR contains multiple paths or JAR files, then they should be separated with a colon (:) on Oracle Solaris and a semicolon (;) on Windows\&. This option is not necessary when the class is already in the search path\&.
-+
-+The following example shows how to specify the path to a JAR file that contains the class file\&. The JAR file name is included\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/lib/authsigner\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+The following example shows how to specify the path to the JAR file that contains the class file\&. The JAR file name is omitted\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-strict
-+.br
-+During the signing or verifying process, the command may issue warning messages\&. If you specify this option, the exit code of the tool reflects the severe warning messages that this command found\&. See Errors and Warnings\&.
-+.TP
-+-verbose \fIsuboptions\fR
-+.br
-+For the verifying process, the \f3-verbose\fR option takes suboptions to determine how much information is shown\&. If the \f3-certs\fR option is also specified, then the default mode (or suboption \f3all\fR) displays each entry as it is being processed, and after that, the certificate information for each signer of the JAR file\&. If the \f3-certs\fR and the \f3-verbose:grouped\fR suboptions are specified, then entries with the same signer info are grouped and displayed together with their certificate information\&. If \f3-certs\fR and the \f3-verbose:summary\fR suboptions are specified, then entries with the same signer information are grouped and displayed together with their certificate information\&. Details about each entry are summarized and displayed as \fIone entry (and more)\fR\&. See Examples\&.
-+.SH ERRORS\ AND\ WARNINGS
-+During the signing or verifying process, the \f3jarsigner\fR command may issue various errors or warnings\&.
-+.PP
-+If there is a failure, the \f3jarsigner\fR command exits with code 1\&. If there is no failure, but there are one or more severe warnings, the \f3jarsigner\fR command exits with code 0 when the \f3-strict\fR option is \fInot\fR specified, or exits with the OR-value of the warning codes when the \f3-strict\fR is specified\&. If there is only informational warnings or no warning at all, the command always exits with code 0\&.
-+.PP
-+For example, if a certificate used to sign an entry is expired and has a KeyUsage extension that does not allow it to sign a file, the \f3jarsigner\fR command exits with code 12 (=4+8) when the \f3-strict\fR option is specified\&.
-+.PP
-+\fINote:\fR Exit codes are reused because only the values from 0 to 255 are legal on Unix-based operating systems\&.
-+.PP
-+The following sections describes the names, codes, and descriptions of the errors and warnings that the \f3jarsigner\fR command can issue\&.
-+.SS FAILURE
-+Reasons why the \f3jarsigner\fR command fails include (but are not limited to) a command line parsing error, the inability to find a keypair to sign the JAR file, or the verification of a signed JAR fails\&.
-+.TP
-+failure
-+Code 1\&. The signing or verifying fails\&.
-+.SS SEVERE\ WARNINGS
-+\fINote:\fR Severe warnings are reported as errors if you specify the \f3-strict\fR option\&.
-+.PP
-+Reasons why the \f3jarsigner\fR command issues a severe warning include the certificate used to sign the JAR file has an error or the signed JAR file has other problems\&.
-+.TP
-+hasExpiredCert
-+Code 4\&. This jar contains entries whose signer certificate has expired\&.
-+.TP
-+notYetValidCert
-+Code 4\&. This jar contains entries whose signer certificate is not yet valid\&.
-+.TP
-+chainNotValidated
-+Code 4\&. This jar contains entries whose certificate chain cannot be correctly validated\&.
-+.TP
-+badKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s KeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badExtendedKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s ExtendedKeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badNetscapeCertType
-+Code 8\&. This jar contains entries whose signer certificate\&'s NetscapeCertType extension doesn\&'t allow code signing\&.
-+.TP
-+hasUnsignedEntry
-+Code 16\&. This jar contains unsigned entries which have not been integrity-checked\&.
-+.TP
-+notSignedByAlias
-+Code 32\&. This jar contains signed entries which are not signed by the specified alias(es)\&.
-+.TP
-+aliasNotInStore
-+Code 32\&. This jar contains signed entries that are not signed by alias in this keystore\&.
-+.SS INFORMATIONAL\ WARNINGS
-+Informational warnings include those that are not errors but regarded as bad practice\&. They do not have a code\&.
-+.TP
-+hasExpiringCert
-+This jar contains entries whose signer certificate will expire within six months\&.
-+.TP
-+noTimestamp
-+This jar contains signatures that does not include a timestamp\&. Without a timestamp, users may not be able to validate this JAR file after the signer certificate\&'s expiration date (\f3YYYY-MM-DD\fR) or after any future revocation date\&.
-+.SH EXAMPLES
-+.SS SIGN\ A\ JAR\ FILE
-+Use the following command to sign bundle\&.jar with the private key of a user whose keystore alias is \f3jane\fR in a keystore named \f3mystore\fR in the \f3working\fR directory and name the signed JAR file \f3sbundle\&.jar\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password>\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+There is no \f3-sigfile\fR specified in the previous command so the generated \f3\&.SF\fR and \f3\&.DSA\fR files to be placed in the signed JAR file have default names based on the alias name\&. They are named \f3JANE\&.SF\fR and \f3JANE\&.DSA\fR\&.
-+.PP
-+If you want to be prompted for the store password and the private key password, then you could shorten the previous command to the following:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the keystore is the default keystore (\&.keystore in your home directory), then you do not need to specify a keystore, as follows:
-+.sp
-+.nf
-+\f3jarsigner \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If you want the signed JAR file to overwrite the input JAR file (bundle\&.jar), then you do not need to specify a \f3-signedjar\fR option, as follows:
-+.sp
-+.nf
-+\f3jarsigner bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFY\ A\ SIGNED\ JAR\ FILE
-+To verify a signed JAR file to ensure that the signature is valid and the JAR file was not been tampered with, use a command such as the following:
-+.sp
-+.nf
-+\f3jarsigner \-verify sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When the verification is successful, \f3jar verified\fR is displayed\&. Otherwise, an error message is displayed\&. You can get more information when you use the \f3-verbose\fR option\&. A sample use of \f3jarsigner\fR with the\f3-verbose\fR option follows:
-+.sp
-+.nf
-+\f3jarsigner \-verify \-verbose sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx\&.class\fP
-+.fi
-+.nf
-+\f3 smk 849 Fri Sep 26 16:12:46 PDT 1997 test\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFICATION\ WITH\ CERTIFICATE\ INFORMATION
-+If you specify the \f3-certs\fR option with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. The information includes the certificate type, the signer distinguished name information (when it is an X\&.509 certificate), and in parentheses, the keystore alias for the signer when the public key certificate in the JAR file matches the one in a keystore entry, for example:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.SF\fP
-+.fi
-+.nf
-+\f3 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Test Group, OU=Java Software, O=Oracle, L=CUP, S=CA, C=US (javatest)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&.
-+.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS
-+If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&.
-+.PP
-+When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example:
-+.sp
-+.nf
-+\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3 i = at least one certificate was found in identity scope\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&.
-+.SH JDK\ 1\&.1\ COMPATIBILITY
-+The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&.
-+.PP
-+The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following:
-+.TP 0.2i
-+\(bu
-+It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&.
-+.SS UNSIGNED\ JARS
-+Unsigned JARs have the default privileges that are granted to all code\&.
-+.SS SIGNED\ JARS
-+Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&.
-+.PP
-+Default Privileges Granted to All Code
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 and 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Default Privileges and Policy File Privileges Granted
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 2 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+All Privileges Granted
-+
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Notes Regarding Privileges of Signed JARs
-+.TP 0.4i
-+1\&.
-+If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&.
-+.TP 0.4i
-+2\&.
-+The policy file/keystore combination has precedence over a trusted identity in the identity database\&.
-+.TP 0.4i
-+3\&.
-+Untrusted identities are ignored in the Java platform\&.
-+.SH SEE\ ALSO
-+.TP 0.2i
-+\(bu
-+\f3jar\fR
-+.TP 0.2i
-+\(bu
-+\f3keytool\fR
-+.TP 0.2i
-+\(bu
-+Trail: Security Features in Java SE at http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html
-+.RE
-+.br
-+'pl 8.5i
-+'bp
--- jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2013-09-06 11:27:48.000000000 -0700
-+++ jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2013-12-01 11:14:34.000000000 -0800
++++ jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2014-04-20 12:39:22.000000000 -0700
@@ -37,8 +37,6 @@
import sun.swing.*;
import apple.laf.*;
@@ -43379,7 +27457,7 @@
while (propertyKeys.hasMoreElements()) {
--- jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2013-09-06 11:27:48.000000000 -0700
-+++ jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2013-12-01 11:14:34.000000000 -0800
++++ jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2014-04-20 12:39:22.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
@@ -43828,7 +27906,7 @@
return;
}
--- jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2013-09-06 11:27:48.000000000 -0700
-+++ jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2013-12-01 11:14:34.000000000 -0800
++++ jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2014-04-20 12:39:22.000000000 -0700
@@ -37,26 +37,31 @@
import sun.lwawt.LWToolkit;
import sun.lwawt.macosx.*;
@@ -44123,7 +28201,7 @@
MenuItem sm = fItems.get(m);
--- jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2013-09-06 11:27:48.000000000 -0700
-+++ jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2014-04-20 12:39:22.000000000 -0700
@@ -46,7 +46,7 @@
FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
@@ -44246,6 +28324,455 @@
- private static native String getPathToBundleFile(String filename);
-}
-
+--- jdk/src/macosx/classes/sun/font/CFontManager.java 2013-09-06 11:27:48.000000000 -0700
++++ jdk/src/macosx/classes/sun/font/CFontManager.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -27,6 +27,8 @@
+
+ import java.awt.*;
+ import java.io.File;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.Hashtable;
+@@ -38,6 +40,7 @@
+
+ import sun.awt.FontConfiguration;
+ import sun.awt.HeadlessToolkit;
++import sun.misc.ThreadGroupUtils;
+ import sun.lwawt.macosx.*;
+
+ public class CFontManager extends SunFontManager {
+@@ -215,24 +218,22 @@
+ });
+ }
+ };
+- java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction<Object>() {
+- public Object run() {
++ AccessController.doPrivileged(
++ new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
+ /* The thread must be a member of a thread group
+ * which will not get GCed before VM exit.
+ * Make its parent the top-level thread group.
+ */
+- ThreadGroup tg =
+- Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null;
+- tg = tgn, tgn = tg.getParent());
+- fileCloser = new Thread(tg, fileCloserRunnable);
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ fileCloser = new Thread(rootTG, fileCloserRunnable);
+ fileCloser.setContextClassLoader(null);
+ Runtime.getRuntime().addShutdownHook(fileCloser);
+ return null;
+ }
+- });
++ }
++ );
+ }
+ }
+ }
+--- jdk/src/macosx/classes/sun/font/CStrike.java 2013-09-06 11:27:48.000000000 -0700
++++ jdk/src/macosx/classes/sun/font/CStrike.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -31,7 +31,7 @@
+
+ import sun.awt.SunHints;
+
+-public class CStrike extends FontStrike {
++public final class CStrike extends FontStrike {
+
+ // Creates the native strike
+ private static native long createNativeStrikePtr(long nativeFontPtr,
+@@ -68,10 +68,10 @@
+ Rectangle2D.Float result,
+ double x, double y);
+
+- private CFont nativeFont;
++ private final CFont nativeFont;
+ private AffineTransform invDevTx;
+- private GlyphInfoCache glyphInfoCache;
+- private GlyphAdvanceCache glyphAdvanceCache;
++ private final GlyphInfoCache glyphInfoCache;
++ private final GlyphAdvanceCache glyphAdvanceCache;
+ private long nativeStrikePtr;
+
+ CStrike(final CFont font, final FontStrikeDesc inDesc) {
+@@ -84,11 +84,11 @@
+ // Normally the device transform should be the identity transform
+ // for screen operations. The device transform only becomes
+ // interesting when we are outputting between different dpi surfaces,
+- // like when we are printing to postscript.
++ // like when we are printing to postscript or use retina.
+ if (inDesc.devTx != null && !inDesc.devTx.isIdentity()) {
+ try {
+ invDevTx = inDesc.devTx.createInverse();
+- } catch (NoninvertibleTransformException e) {
++ } catch (NoninvertibleTransformException ignored) {
+ // ignored, since device transforms should not be that
+ // complicated, and if they are - there is nothing we can do,
+ // so we won't worry about it.
+@@ -134,15 +134,13 @@
+ nativeStrikePtr = 0;
+ }
+
+- // the fractional metrics default on our platform is OFF
+- private boolean useFractionalMetrics() {
+- return desc.fmHint == SunHints.INTVAL_FRACTIONALMETRICS_ON;
+- }
+
++ @Override
+ public int getNumGlyphs() {
+ return nativeFont.getNumGlyphs();
+ }
+
++ @Override
+ StrikeMetrics getFontMetrics() {
+ if (strikeMetrics == null) {
+ StrikeMetrics metrics = getFontMetrics(getNativeStrikePtr());
+@@ -155,74 +153,24 @@
+ return strikeMetrics;
+ }
+
+- float getGlyphAdvance(int glyphCode) {
+- return getScaledAdvanceForAdvance(getCachedNativeGlyphAdvance(glyphCode));
+- }
+-
+- float getCodePointAdvance(int cp) {
+- float advance = getCachedNativeGlyphAdvance(nativeFont.getMapper().charToGlyph(cp));
+-
+- double glyphScaleX = desc.glyphTx.getScaleX();
+- double devScaleX = desc.devTx.getScaleX();
+-
+- if (devScaleX == 0) {
+- glyphScaleX = Math.sqrt(desc.glyphTx.getDeterminant());
+- devScaleX = Math.sqrt(desc.devTx.getDeterminant());
+- }
+-
+- if (devScaleX == 0) {
+- devScaleX = Double.NaN; // this an undefined graphics state
+- }
+- advance = (float) (advance * glyphScaleX / devScaleX);
+- return useFractionalMetrics() ? advance : Math.round(advance);
+- }
+-
+- // calculate an advance, and round if not using fractional metrics
+- private float getScaledAdvanceForAdvance(float advance) {
+- if (invDevTx != null) {
+- advance *= invDevTx.getScaleX();
+- }
+- advance *= desc.glyphTx.getScaleX();
+- return useFractionalMetrics() ? advance : Math.round(advance);
+- }
+-
+- Point2D.Float getCharMetrics(char ch) {
+- return getScaledPointForAdvance(getCachedNativeGlyphAdvance(nativeFont.getMapper().charToGlyph(ch)));
++ @Override
++ float getGlyphAdvance(final int glyphCode) {
++ return getCachedNativeGlyphAdvance(glyphCode);
+ }
+
+- Point2D.Float getGlyphMetrics(int glyphCode) {
+- return getScaledPointForAdvance(getCachedNativeGlyphAdvance(glyphCode));
++ @Override
++ float getCodePointAdvance(final int cp) {
++ return getGlyphAdvance(nativeFont.getMapper().charToGlyph(cp));
+ }
+
+- // calculate an advance point, and round if not using fractional metrics
+- private Point2D.Float getScaledPointForAdvance(float advance) {
+- Point2D.Float pt = new Point2D.Float(advance, 0);
+-
+- if (!desc.glyphTx.isIdentity()) {
+- return scalePoint(pt);
+- }
+-
+- if (!useFractionalMetrics()) {
+- pt.x = Math.round(pt.x);
+- }
+- return pt;
++ @Override
++ Point2D.Float getCharMetrics(final char ch) {
++ return getGlyphMetrics(nativeFont.getMapper().charToGlyph(ch));
+ }
+
+- private Point2D.Float scalePoint(Point2D.Float pt) {
+- if (invDevTx != null) {
+- // transform the point out of the device space first
+- invDevTx.transform(pt, pt);
+- }
+- desc.glyphTx.transform(pt, pt);
+- pt.x -= desc.glyphTx.getTranslateX();
+- pt.y -= desc.glyphTx.getTranslateY();
+-
+- if (!useFractionalMetrics()) {
+- pt.x = Math.round(pt.x);
+- pt.y = Math.round(pt.y);
+- }
+-
+- return pt;
++ @Override
++ Point2D.Float getGlyphMetrics(final int glyphCode) {
++ return new Point2D.Float(getGlyphAdvance(glyphCode), 0.0f);
+ }
+
+ Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
+@@ -414,9 +362,7 @@
+ private SparseBitShiftingTwoLayerArray secondLayerCache;
+ private HashMap<Integer, Long> generalCache;
+
+- public GlyphInfoCache(final Font2D nativeFont,
+- final FontStrikeDesc desc)
+- {
++ GlyphInfoCache(final Font2D nativeFont, final FontStrikeDesc desc) {
+ super(nativeFont, desc);
+ firstLayerCache = new long[FIRST_LAYER_SIZE];
+ }
+@@ -527,7 +473,7 @@
+ final int shift;
+ final int secondLayerLength;
+
+- public SparseBitShiftingTwoLayerArray(final int size, final int shift) {
++ SparseBitShiftingTwoLayerArray(final int size, final int shift) {
+ this.shift = shift;
+ this.cache = new long[1 << shift][];
+ this.secondLayerLength = size >> shift;
+@@ -559,6 +505,12 @@
+ private SparseBitShiftingTwoLayerArray secondLayerCache;
+ private HashMap<Integer, Float> generalCache;
+
++ // Empty non private constructor was added because access to this
++ // class shouldn't be emulated by a synthetic accessor method.
++ GlyphAdvanceCache() {
++ super();
++ }
++
+ public synchronized float get(final int index) {
+ if (index < 0) {
+ if (-index < SECOND_LAYER_SIZE) {
+@@ -609,9 +561,7 @@
+ final int shift;
+ final int secondLayerLength;
+
+- public SparseBitShiftingTwoLayerArray(final int size,
+- final int shift)
+- {
++ SparseBitShiftingTwoLayerArray(final int size, final int shift) {
+ this.shift = shift;
+ this.cache = new float[1 << shift][];
+ this.secondLayerLength = size >> shift;
+--- jdk/src/macosx/classes/sun/lwawt/LWToolkit.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/LWToolkit.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -37,6 +37,7 @@
+
+ import sun.awt.*;
+ import sun.lwawt.macosx.*;
++import sun.misc.ThreadGroupUtils;
+ import sun.print.*;
+
+ public abstract class LWToolkit extends SunToolkit implements Runnable {
+@@ -66,22 +67,17 @@
+ protected final void init() {
+ AWTAutoShutdown.notifyToolkitThreadBusy();
+
+- ThreadGroup mainTG = AccessController.doPrivileged(
+- new PrivilegedAction<ThreadGroup>() {
+- public ThreadGroup run() {
+- ThreadGroup currentTG = Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = currentTG.getParent();
+- while (parentTG != null) {
+- currentTG = parentTG;
+- parentTG = currentTG.getParent();
++ ThreadGroup rootTG = AccessController.doPrivileged(
++ new PrivilegedAction<ThreadGroup>() {
++ @Override
++ public ThreadGroup run() {
++ return ThreadGroupUtils.getRootThreadGroup();
+ }
+- return currentTG;
+- }
+- }
+- );
++ });
+
+ Runtime.getRuntime().addShutdownHook(
+- new Thread(mainTG, new Runnable() {
++ new Thread(rootTG, new Runnable() {
++ @Override
+ public void run() {
+ shutdown();
+ waitForRunState(STATE_CLEANUP);
+@@ -89,7 +85,7 @@
+ })
+ );
+
+- Thread toolkitThread = new Thread(mainTG, this, "AWT-LW");
++ Thread toolkitThread = new Thread(rootTG, this, "AWT-LW");
+ toolkitThread.setDaemon(true);
+ toolkitThread.setPriority(Thread.NORM_PRIORITY + 1);
+ toolkitThread.start();
+--- jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java 2014-04-20 12:39:22.000000000 -0700
+@@ -53,7 +53,7 @@
+ }
+
+ protected void setContentsNative(Transferable contents) {
+-
++ FlavorTable flavorMap = getDefaultFlavorTable();
+ // Don't use delayed Clipboard rendering for the Transferable's data.
+ // If we did that, we would call Transferable.getTransferData on
+ // the Toolkit thread, which is a security hole.
+--- jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java 2014-04-20 12:39:22.000000000 -0700
+@@ -620,8 +620,7 @@
+ retString[0] = new String(selectedText);
+ }}
+ }, fAwtFocussedComponent);
+- } catch (InterruptedException ie) { ie.printStackTrace(); }
+- catch (InvocationTargetException ite) { ite.printStackTrace(); }
++ } catch (InvocationTargetException ite) { ite.printStackTrace(); }
+
+ synchronized(retString) { return retString[0]; }
+ }
+@@ -669,8 +668,7 @@
+
+ }}
+ }, fAwtFocussedComponent);
+- } catch (InterruptedException ie) { ie.printStackTrace(); }
+- catch (InvocationTargetException ite) { ite.printStackTrace(); }
++ } catch (InvocationTargetException ite) { ite.printStackTrace(); }
+
+ synchronized(returnValue) { return returnValue; }
+ }
+@@ -695,8 +693,7 @@
+ returnValue[0] = fIMContext.getInsertPositionOffset();
+ }}
+ }, fAwtFocussedComponent);
+- } catch (InterruptedException ie) { ie.printStackTrace(); }
+- catch (InvocationTargetException ite) { ite.printStackTrace(); }
++ } catch (InvocationTargetException ite) { ite.printStackTrace(); }
+
+ returnValue[1] = fCurrentTextLength;
+ synchronized(returnValue) { return returnValue; }
+@@ -743,8 +740,7 @@
+ }
+ }}
+ }, fAwtFocussedComponent);
+- } catch (InterruptedException ie) { ie.printStackTrace(); }
+- catch (InvocationTargetException ite) { ite.printStackTrace(); }
++ } catch (InvocationTargetException ite) { ite.printStackTrace(); }
+
+ synchronized(rect) { return rect; }
+ }
+@@ -764,8 +760,7 @@
+ insertPositionOffset[0] = fIMContext.getInsertPositionOffset();
+ }}
+ }, fAwtFocussedComponent);
+- } catch (InterruptedException ie) { ie.printStackTrace(); }
+- catch (InvocationTargetException ite) { ite.printStackTrace(); }
++ } catch (InvocationTargetException ite) { ite.printStackTrace(); }
+
+ // This bit of gymnastics ensures that the returned location is within the composed text.
+ // If it falls outside that region, the input method will commit the text, which is inconsistent with native
+--- jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2014-04-20 12:39:22.000000000 -0700
+@@ -918,7 +918,7 @@
+ //Posting an empty to flush the EventQueue without blocking the main thread
+ }
+ }, target);
+- } catch (InterruptedException | InvocationTargetException e) {
++ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+--- jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java 2014-04-20 12:39:22.000000000 -0700
+@@ -97,6 +97,6 @@
+ setVisible(true);
+ }
+ }, this);
+- } catch (InterruptedException | InvocationTargetException ex) {}
++ } catch (InvocationTargetException ex) {}
+ }
+ }
+--- jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2013-09-06 11:27:49.000000000 -0700
++++ jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2014-04-20 12:39:22.000000000 -0700
+@@ -414,8 +414,15 @@
+ }
+
+ // Intended to be called from the LWCToolkit.m only.
+- private static void installToolkitThreadNameInJava() {
++ private static void installToolkitThreadInJava() {
+ Thread.currentThread().setName(CThreading.APPKIT_THREAD_NAME);
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ Thread.currentThread().setContextClassLoader(null);
++ return null;
++ }
++ });
+ }
+
+ @Override
+@@ -518,22 +525,21 @@
+ // Any selector invoked using ThreadUtilities performOnMainThread will be processed in doAWTRunLoop
+ // The InvocationEvent will call LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual runloop
+ // Does not dispatch native events while in the loop
+- public static void invokeAndWait(Runnable event, Component component) throws InterruptedException, InvocationTargetException {
++ public static void invokeAndWait(Runnable runnable, Component component) throws InvocationTargetException {
+ final long mediator = createAWTRunLoopMediator();
+
+- InvocationEvent invocationEvent =
+- new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event) {
+- @Override
+- public void dispatch() {
+- try {
+- super.dispatch();
+- } finally {
+- if (mediator != 0) {
+- stopAWTRunLoop(mediator);
++ InvocationEvent invocationEvent = AWTAccessor.getInvocationEventAccessor()
++ .createEvent(component != null ? component : Toolkit.getDefaultToolkit(),
++ runnable,
++ new Runnable() {
++ @Override
++ public void run() {
++ if (mediator != 0) {
++ stopAWTRunLoop(mediator);
++ }
+ }
+- }
+- }
+- };
++ },
++ true);
+
+ if (component != null) {
+ AppContext appContext = SunToolkit.targetToAppContext(component);
--- jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m 2013-09-06 11:27:49.000000000 -0700
+++ jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m 1969-12-31 16:00:00.000000000 -0800
@@ -1,110 +0,0 @@
@@ -44359,8 +28886,47 @@
-
- return returnVal;
-}
+--- jdk/src/macosx/native/sun/awt/LWCToolkit.m 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/awt/LWCToolkit.m 2014-04-20 12:39:22.000000000 -0700
+@@ -193,8 +193,8 @@
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ static JNF_CLASS_CACHE(jc_LWCToolkit, "sun/lwawt/macosx/LWCToolkit");
+- static JNF_STATIC_MEMBER_CACHE(jsm_installToolkitThreadNameInJava, jc_LWCToolkit, "installToolkitThreadNameInJava", "()V");
+- JNFCallStaticVoidMethod(env, jsm_installToolkitThreadNameInJava);
++ static JNF_STATIC_MEMBER_CACHE(jsm_installToolkitThreadInJava, jc_LWCToolkit, "installToolkitThreadInJava", "()V");
++ JNFCallStaticVoidMethod(env, jsm_installToolkitThreadInJava);
+ });
+
+ gNumberOfButtons = sun_lwawt_macosx_LWCToolkit_BUTTONS;
+--- jdk/src/macosx/native/sun/awt/awt.m 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/awt/awt.m 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -432,6 +432,16 @@
+ forceEmbeddedMode = YES;
+ }
+
++ JNIEnv* env = [ThreadUtilities getJNIEnvUncached];
++ jclass jc_ThreadGroupUtils = (*env)->FindClass(env, "sun/misc/ThreadGroupUtils");
++ jmethodID sjm_getRootThreadGroup = (*env)->GetStaticMethodID(env, jc_ThreadGroupUtils, "getRootThreadGroup", "()Ljava/lang/ThreadGroup;");
++ jobject rootThreadGroup = (*env)->CallStaticObjectMethod(env, jc_ThreadGroupUtils, sjm_getRootThreadGroup);
++ [ThreadUtilities setAppkitThreadGroup:(*env)->NewGlobalRef(env, rootThreadGroup)];
++
++ // The current thread was attached in getJNIEnvUncached.
++ // Detach it back. It will be reattached later if needed with a proper TG
++ [ThreadUtilities detachCurrentThread];
++
+ BOOL headless = isHeadless(env);
+
+ // We need to let Foundation know that this is a multithreaded application, if it isn't already.
--- jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2013-09-06 11:27:51.000000000 -0700
-+++ jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2014-04-20 12:39:22.000000000 -0700
@@ -290,8 +290,8 @@
SplashUnlock(splash);
rc = poll(pfd, 1, timeout);
@@ -44372,8 +28938,205 @@
SplashNextFrame(splash);
SplashRedrawWindow(splash);
}
+--- jdk/src/macosx/native/sun/font/AWTStrike.h 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/font/AWTStrike.h 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -31,11 +31,12 @@
+ @interface AWTStrike : NSObject {
+ @public
+ AWTFont * fAWTFont;
+- CGFloat fSize;
++ CGFloat fSize;
+ JRSFontRenderingStyle fStyle;
+- jint fAAStyle;
++ jint fAAStyle;
+
+ CGAffineTransform fTx;
++ CGAffineTransform fDevTx;
+ CGAffineTransform fAltTx; // alternate strike tx used for Sun2D
+ CGAffineTransform fFontTx;
+ }
+--- jdk/src/macosx/native/sun/font/AWTStrike.m 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/font/AWTStrike.m 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -60,6 +60,7 @@
+ invDevTx.b *= -1;
+ invDevTx.c *= -1;
+ fFontTx = CGAffineTransformConcat(CGAffineTransformConcat(tx, invDevTx), sInverseTX);
++ fDevTx = CGAffineTransformInvert(invDevTx);
+
+ // the "font size" is the square root of the determinant of the matrix
+ fSize = sqrt(abs(fFontTx.a * fFontTx.d - fFontTx.b * fFontTx.c));
+@@ -143,7 +144,8 @@
+ {
+ CGSize advance;
+ JNF_COCOA_ENTER(env);
+- AWTFont *awtFont = ((AWTStrike *)jlong_to_ptr(awtStrikePtr))->fAWTFont;
++ AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
++ AWTFont *awtFont = awtStrike->fAWTFont;
+
+ // negative glyph codes are really unicodes, which were placed there by the mapper
+ // to indicate we should use CoreText to substitute the character
+@@ -151,6 +153,10 @@
+ const CTFontRef fallback = CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode(awtFont, glyphCode, &glyph);
+ CTFontGetAdvancesForGlyphs(fallback, kCTFontDefaultOrientation, &glyph, &advance, 1);
+ CFRelease(fallback);
++ advance = CGSizeApplyAffineTransform(advance, awtStrike->fFontTx);
++ if (!JRSFontStyleUsesFractionalMetrics(awtStrike->fStyle)) {
++ advance.width = round(advance.width);
++ }
+
+ JNF_COCOA_EXIT(env);
+ return advance.width;
+--- jdk/src/macosx/native/sun/font/CGGlyphImages.m 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/font/CGGlyphImages.m 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -455,6 +455,7 @@
+ #define CGGI_GLYPH_BBOX_PADDING 2.0f
+ static inline GlyphInfo *
+ CGGI_CreateNewGlyphInfoFrom(CGSize advance, CGRect bbox,
++ const AWTStrike *strike,
+ const CGGI_RenderingMode *mode)
+ {
+ size_t pixelSize = mode->glyphDescriptor->pixelSize;
+@@ -477,6 +478,12 @@
+ width = 1;
+ height = 1;
+ }
++ advance = CGSizeApplyAffineTransform(advance, strike->fFontTx);
++ if (!JRSFontStyleUsesFractionalMetrics(strike->fStyle)) {
++ advance.width = round(advance.width);
++ advance.height = round(advance.height);
++ }
++ advance = CGSizeApplyAffineTransform(advance, strike->fDevTx);
+
+ #ifdef USE_IMAGE_ALIGNED_MEMORY
+ // create separate memory
+@@ -564,10 +571,10 @@
+ JRSFontGetBoundingBoxesForGlyphsAndStyle(fallback, &tx, style, &glyph, 1, &bbox);
+
+ CGSize advance;
+- JRSFontGetAdvancesForGlyphsAndStyle(fallback, &tx, strike->fStyle, &glyph, 1, &advance);
++ CTFontGetAdvancesForGlyphs(fallback, kCTFontDefaultOrientation, &glyph, &advance, 1);
+
+ // create the Sun2D GlyphInfo we are going to strike into
+- GlyphInfo *info = CGGI_CreateNewGlyphInfoFrom(advance, bbox, mode);
++ GlyphInfo *info = CGGI_CreateNewGlyphInfoFrom(advance, bbox, strike, mode);
+
+ // fix the context size, just in case the substituted character is unexpectedly large
+ CGGI_SizeCanvas(canvas, info->width, info->height, mode->cgFontMode);
+@@ -715,7 +722,7 @@
+ JRSFontRenderingStyle bboxCGMode = JRSFontAlignStyleForFractionalMeasurement(strike->fStyle);
+
+ JRSFontGetBoundingBoxesForGlyphsAndStyle((CTFontRef)font->fFont, &tx, bboxCGMode, glyphs, len, bboxes);
+- JRSFontGetAdvancesForGlyphsAndStyle((CTFontRef)font->fFont, &tx, strike->fStyle, glyphs, len, advances);
++ CTFontGetAdvancesForGlyphs((CTFontRef)font->fFont, kCTFontDefaultOrientation, glyphs, advances, len);
+
+ size_t maxWidth = 1;
+ size_t maxHeight = 1;
+@@ -732,7 +739,7 @@
+ CGSize advance = advances[i];
+ CGRect bbox = bboxes[i];
+
+- GlyphInfo *glyphInfo = CGGI_CreateNewGlyphInfoFrom(advance, bbox, mode);
++ GlyphInfo *glyphInfo = CGGI_CreateNewGlyphInfoFrom(advance, bbox, strike, mode);
+
+ if (maxWidth < glyphInfo->width) maxWidth = glyphInfo->width;
+ if (maxHeight < glyphInfo->height) maxHeight = glyphInfo->height;
+--- jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -127,6 +127,8 @@
+
+ + (JNIEnv*)getJNIEnv;
+ + (JNIEnv*)getJNIEnvUncached;
+++ (void)detachCurrentThread;
+++ (void)setAppkitThreadGroup:(jobject)group;
+
+ //Wrappers for the corresponding JNFRunLoop methods with a check for main thread
+ + (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block;
+--- jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m 2013-09-06 11:27:51.000000000 -0700
++++ jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -33,23 +33,44 @@
+ // The following must be named "jvm", as there are extern references to it in AWT
+ JavaVM *jvm = NULL;
+ static JNIEnv *appKitEnv = NULL;
++static jobject appkitThreadGroup = NULL;
++
++inline void attachCurrentThread(void** env) {
++ if ([NSThread isMainThread]) {
++ JavaVMAttachArgs args;
++ args.version = JNI_VERSION_1_4;
++ args.name = "AppKit Thread";
++ args.group = appkitThreadGroup;
++ (*jvm)->AttachCurrentThreadAsDaemon(jvm, env, &args);
++ } else {
++ (*jvm)->AttachCurrentThreadAsDaemon(jvm, env, NULL);
++ }
++}
+
+ @implementation ThreadUtilities
+
+ + (JNIEnv*)getJNIEnv {
+ AWT_ASSERT_APPKIT_THREAD;
+ if (appKitEnv == NULL) {
+- (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void **)&appKitEnv, NULL);
++ attachCurrentThread((void **)&appKitEnv);
+ }
+ return appKitEnv;
+ }
+
+ + (JNIEnv*)getJNIEnvUncached {
+ JNIEnv *env = NULL;
+- (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void **)&env, nil);
++ attachCurrentThread((void **)&env);
+ return env;
+ }
+
+++ (void)detachCurrentThread {
++ (*jvm)->DetachCurrentThread(jvm);
++}
++
+++ (void)setAppkitThreadGroup:(jobject)group {
++ appkitThreadGroup = group;
++}
++
+ + (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block {
+ if ([NSThread isMainThread] && wait == YES) {
+ block();
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44384,7 +29147,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44395,7 +29158,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44406,7 +29169,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44417,7 +29180,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44428,7 +29191,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2014-04-20 12:39:21.000000000 -0700
@@ -102,7 +102,7 @@
#
# accessible actions
@@ -44439,7 +29202,7 @@
# new relations, roles and states for J2SE 1.5.0
--- jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-09-06 11:27:52.000000000 -0700
-+++ jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-04-20 12:39:21.000000000 -0700
@@ -29,6 +29,7 @@
import java.beans.ExceptionListener;
@@ -44464,7 +29227,7 @@
*/
@Override
--- jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -44485,7 +29248,7 @@
throw new NoSuchAlgorithmException("Unsupported secret key "
+ "algorithm: "+ algorithm);
--- jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -44517,7 +29280,7 @@
try {
DerInputStream in = new DerInputStream(this.key);
--- jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -44550,7 +29313,7 @@
}
--- jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2014-04-20 12:39:21.000000000 -0700
@@ -53,7 +53,10 @@
public static void ObjectInit(Object obj)
@@ -44606,7 +29369,7 @@
}
}
--- jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-04-20 12:39:21.000000000 -0700
@@ -1160,6 +1160,11 @@
target = imRas;
}
@@ -44620,7 +29383,7 @@
/*
* If the process is sequential, and we have restart markers,
--- jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-09-06 11:27:53.000000000 -0700
-+++ jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-04-20 12:39:21.000000000 -0700
@@ -490,8 +490,8 @@
// handle <= 8-bit samples. We now check the band sizes and throw
// an exception for images, such as USHORT_GRAY, with > 8 bits
@@ -44633,7 +29396,7 @@
// 4450894 part 2: We expand IndexColorModel images to full 24-
// or 32-bit in grabPixels() for each scanline. For indexed
--- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2013-09-06 11:27:54.000000000 -0700
-+++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
@@ -44644,7 +29407,7 @@
FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
--- jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2013-09-06 11:27:54.000000000 -0700
-+++ jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2014-04-20 12:39:21.000000000 -0700
@@ -24,7 +24,7 @@
FileChooser.openButton.textAndMnemonic=\uD655\uC778
FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
@@ -44662,7 +29425,7 @@
+FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.
FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0\uC785\uB2C8\uB2E4.
--- jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2013-09-06 11:27:56.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2013-12-01 11:14:38.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
@@ -44733,8 +29496,57 @@
+ }
}
}
+--- jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2013-09-06 11:27:56.000000000 -0700
++++ jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-04-20 12:39:21.000000000 -0700
+@@ -35,6 +35,8 @@
+ import javax.management.remote.SubjectDelegationPermission;
+
+ import com.sun.jmx.remote.util.CacheMap;
++import java.util.ArrayList;
++import java.util.Collection;
+
+ public class SubjectDelegator {
+ private static final int PRINCIPALS_CACHE_SIZE = 10;
+@@ -53,11 +55,14 @@
+ boolean removeCallerContext)
+ throws SecurityException {
+
++ if (System.getSecurityManager() != null && authenticatedACC == null) {
++ throw new SecurityException("Illegal AccessControlContext: null");
++ }
+ if (principalsCache == null || accCache == null) {
+ principalsCache =
+- new CacheMap<Subject, Principal[]>(PRINCIPALS_CACHE_SIZE);
++ new CacheMap<>(PRINCIPALS_CACHE_SIZE);
+ accCache =
+- new CacheMap<Subject, AccessControlContext>(ACC_CACHE_SIZE);
++ new CacheMap<>(ACC_CACHE_SIZE);
+ }
+
+ // Retrieve the principals for the given
+@@ -101,14 +106,15 @@
+ // principal in the delegated subject
+ //
+ final Principal[] dp = delegatedPrincipals;
++ final Collection<Permission> permissions = new ArrayList<>(dp.length);
++ for(Principal p : dp) {
++ final String pname = p.getClass().getName() + "." + p.getName();
++ permissions.add(new SubjectDelegationPermission(pname));
++ }
+ PrivilegedAction<Void> action =
+ new PrivilegedAction<Void>() {
+ public Void run() {
+- for (int i = 0 ; i < dp.length ; i++) {
+- final String pname =
+- dp[i].getClass().getName() + "." + dp[i].getName();
+- Permission sdp =
+- new SubjectDelegationPermission(pname);
++ for (Permission sdp : permissions) {
+ AccessController.checkPermission(sdp);
+ }
+ return null;
--- jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2013-09-06 11:27:57.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2014-04-20 12:39:21.000000000 -0700
@@ -27,17 +27,9 @@
// java imports
@@ -44764,7 +29576,7 @@
/**
--- jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2013-09-06 11:27:57.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2014-04-20 12:39:21.000000000 -0700
@@ -116,7 +116,7 @@
public void validateVarId(long arc, Object userData)
throws SnmpStatusException {
@@ -44831,7 +29643,7 @@
} catch (SnmpStatusException e) {
// We didn't find anything at the given arc, so we're going
--- jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2013-09-06 11:27:57.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2014-04-20 12:39:21.000000000 -0700
@@ -155,7 +155,7 @@
long[] oid, int depth,
SnmpRequestTree handlers)
@@ -44889,7 +29701,7 @@
- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
}
--- jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2013-09-06 11:27:57.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2014-04-20 12:39:21.000000000 -0700
@@ -157,11 +157,11 @@
if (depth > length) {
@@ -44949,7 +29761,7 @@
}
--- jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2013-09-06 11:27:57.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2014-04-20 12:39:21.000000000 -0700
@@ -279,7 +279,7 @@
SnmpVarBind var = null;
for (Enumeration e= r.getElements(); e.hasMoreElements();) {
@@ -45080,7 +29892,7 @@
}
--- jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2013-09-06 11:27:58.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2014-04-20 12:39:21.000000000 -0700
@@ -1146,7 +1146,4 @@
static final private String InterruptSysCallMsg =
@@ -45089,8 +29901,330 @@
- static final private SnmpStatusException noSuchNameException =
- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName) ;
}
+--- jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2013-09-06 11:27:58.000000000 -0700
++++ jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -30,13 +30,14 @@
+ import java.net.DatagramPacket;
+ import java.net.InetAddress;
+ import java.net.Socket;
++import java.security.SecureRandom;
+ import javax.naming.*;
+
+ import java.util.Collections;
+ import java.util.Map;
+ import java.util.HashMap;
+-import java.util.Set;
+-import java.util.HashSet;
++
++import sun.security.jca.JCAUtil;
+
+ // Some of this code began life as part of sun.javaos.net.DnsClient
+ // originally by sritchie@eng 1/96. It was first hacked up for JNDI
+@@ -77,6 +78,8 @@
+ };
+
+ private static final int DEFAULT_PORT = 53;
++ private static final int TRANSACTION_ID_BOUND = 0x10000;
++ private static final SecureRandom random = JCAUtil.getSecureRandom();
+ private InetAddress[] servers;
+ private int[] serverPorts;
+ private int timeout; // initial timeout on UDP queries in ms
+@@ -85,7 +88,7 @@
+ private DatagramSocket udpSocket;
+
+ // Requests sent
+- private Set<Integer> reqs;
++ private Map<Integer, ResourceRecord> reqs;
+
+ // Responses received
+ private Map<Integer, byte[]> resps;
+@@ -134,7 +137,8 @@
+ throw ne;
+ }
+ }
+- reqs = Collections.synchronizedSet(new HashSet<Integer>());
++ reqs = Collections.synchronizedMap(
++ new HashMap<Integer, ResourceRecord>());
+ resps = Collections.synchronizedMap(new HashMap<Integer, byte[]>());
+ }
+
+@@ -153,10 +157,6 @@
+ }
+ }
+
+-
+- private int ident = 0; // used to set the msg ID field
+- private Object identLock = new Object();
+-
+ /*
+ * If recursion is true, recursion is requested on the query.
+ * If auth is true, only authoritative responses are accepted; other
+@@ -167,15 +167,22 @@
+ throws NamingException {
+
+ int xid;
+- synchronized (identLock) {
+- ident = 0xFFFF & (ident + 1);
+- xid = ident;
+- }
++ Packet pkt;
++ ResourceRecord collision;
+
+- // enqueue the outstanding request
+- reqs.add(xid);
+-
+- Packet pkt = makeQueryPacket(fqdn, xid, qclass, qtype, recursion);
++ do {
++ // Generate a random transaction ID
++ xid = random.nextInt(TRANSACTION_ID_BOUND);
++ pkt = makeQueryPacket(fqdn, xid, qclass, qtype, recursion);
++
++ // enqueue the outstanding request
++ synchronized (reqs) {
++ if ((collision = reqs.put(xid, new ResourceRecord(pkt.getData(),
++ pkt.length(), Header.HEADER_SIZE, true, false))) != null) {
++ reqs.put(xid, collision); // revert
++ }
++ }
++ } while (collision != null);
+
+ Exception caughtException = null;
+ boolean[] doNotRetry = new boolean[servers.length];
+@@ -305,11 +312,8 @@
+ ResourceRecords queryZone(DnsName zone, int qclass, boolean recursion)
+ throws NamingException {
+
+- int xid;
+- synchronized (identLock) {
+- ident = 0xFFFF & (ident + 1);
+- xid = ident;
+- }
++ int xid = random.nextInt(TRANSACTION_ID_BOUND);
++
+ Packet pkt = makeQueryPacket(zone, xid, qclass,
+ ResourceRecord.QTYPE_AXFR, recursion);
+ Exception caughtException = null;
+@@ -390,6 +394,7 @@
+ DatagramPacket opkt = new DatagramPacket(
+ pkt.getData(), pkt.length(), server, port);
+ DatagramPacket ipkt = new DatagramPacket(new byte[8000], 8000);
++ // Packets may only be sent to or received from this server address
+ udpSocket.connect(server, port);
+ int pktTimeout = (timeout * (1 << retry));
+ try {
+@@ -524,7 +529,7 @@
+ "\tResponse Q:" + resps);
+ }
+ byte[] pkt;
+- if ((pkt = (byte[]) resps.get(xid)) != null) {
++ if ((pkt = resps.get(xid)) != null) {
+ checkResponseCode(new Header(pkt, pkt.length));
+ synchronized (queuesLock) {
+ resps.remove(xid);
+@@ -543,6 +548,9 @@
+ * Checks the header of an incoming DNS response.
+ * Returns true if it matches the given xid and throws a naming
+ * exception, if appropriate, based on the response code.
++ *
++ * Also checks that the domain name, type and class in the response
++ * match those in the original query.
+ */
+ private boolean isMatchResponse(byte[] pkt, int xid)
+ throws NamingException {
+@@ -552,7 +560,7 @@
+ throw new CommunicationException("DNS error: expecting response");
+ }
+
+- if (!reqs.contains(xid)) { // already received, ignore the response
++ if (!reqs.containsKey(xid)) { // already received, ignore the response
+ return false;
+ }
+
+@@ -561,14 +569,47 @@
+ if (debug) {
+ dprint("XID MATCH:" + xid);
+ }
+-
+ checkResponseCode(hdr);
+- // remove the response for the xid if received by some other thread.
+- synchronized (queuesLock) {
+- resps.remove(xid);
+- reqs.remove(xid);
++ if (!hdr.query && hdr.numQuestions == 1) {
++
++ ResourceRecord rr = new ResourceRecord(pkt, pkt.length,
++ Header.HEADER_SIZE, true, false);
++
++ // Retrieve the original query
++ ResourceRecord query = reqs.get(xid);
++ int qtype = query.getType();
++ int qclass = query.getRrclass();
++ DnsName qname = query.getName();
++
++ // Check that the type/class/name in the query section of the
++ // response match those in the original query
++ if ((qtype == ResourceRecord.QTYPE_STAR ||
++ qtype == rr.getType()) &&
++ (qclass == ResourceRecord.QCLASS_STAR ||
++ qclass == rr.getRrclass()) &&
++ qname.equals(rr.getName())) {
++
++ if (debug) {
++ dprint("MATCH NAME:" + qname + " QTYPE:" + qtype +
++ " QCLASS:" + qclass);
++ }
++
++ // Remove the response for the xid if received by some other
++ // thread.
++ synchronized (queuesLock) {
++ resps.remove(xid);
++ reqs.remove(xid);
++ }
++ return true;
++
++ } else {
++ if (debug) {
++ dprint("NO-MATCH NAME:" + qname + " QTYPE:" + qtype +
++ " QCLASS:" + qclass);
++ }
++ }
+ }
+- return true;
++ return false;
+ }
+
+ //
+@@ -577,7 +618,7 @@
+ // enqueue only the first response, responses for retries are ignored.
+ //
+ synchronized (queuesLock) {
+- if (reqs.contains(hdr.xid)) { // enqueue only the first response
++ if (reqs.containsKey(hdr.xid)) { // enqueue only the first response
+ resps.put(hdr.xid, pkt);
+ }
+ }
+--- jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java 2013-09-06 11:27:58.000000000 -0700
++++ jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,6 +25,10 @@
+
+ package com.sun.jndi.ldap;
+
++import java.security.AccessControlContext;
++import java.security.AccessController;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
+ import java.util.Vector;
+ import javax.naming.*;
+ import javax.naming.directory.*;
+@@ -34,6 +38,8 @@
+
+ final class LdapBindingEnumeration extends LdapNamingEnumeration {
+
++ private final AccessControlContext acc = AccessController.getContext();
++
+ LdapBindingEnumeration(LdapCtx homeCtx, LdapResult answer, Name remain,
+ Continuation cont) throws NamingException
+ {
+@@ -41,7 +47,7 @@
+ }
+
+ protected NameClassPair
+- createItem(String dn, Attributes attrs, Vector respCtls)
++ createItem(String dn, final Attributes attrs, Vector respCtls)
+ throws NamingException {
+
+ Object obj = null;
+@@ -49,7 +55,16 @@
+
+ if (attrs.get(Obj.JAVA_ATTRIBUTES[Obj.CLASSNAME]) != null) {
+ // serialized object or object reference
+- obj = Obj.decodeObject(attrs);
++ try {
++ obj = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
++ @Override
++ public Object run() throws NamingException {
++ return Obj.decodeObject(attrs);
++ }
++ }, acc);
++ } catch (PrivilegedActionException e) {
++ throw (NamingException)e.getException();
++ }
+ }
+ if (obj == null) {
+ // DirContext object
+--- jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java 2013-09-06 11:27:58.000000000 -0700
++++ jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,6 +25,10 @@
+
+ package com.sun.jndi.ldap;
+
++import java.security.AccessControlContext;
++import java.security.AccessController;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
+ import java.util.Vector;
+ import javax.naming.*;
+ import javax.naming.directory.*;
+@@ -39,6 +43,8 @@
+ private Name startName; // prefix of names of search results
+ private LdapCtx.SearchArgs searchArgs = null;
+
++ private final AccessControlContext acc = AccessController.getContext();
++
+ LdapSearchEnumeration(LdapCtx homeCtx, LdapResult search_results,
+ String starter, LdapCtx.SearchArgs args, Continuation cont)
+ throws NamingException {
+@@ -53,7 +59,7 @@
+ }
+
+ protected NameClassPair
+- createItem(String dn, Attributes attrs, Vector respCtls)
++ createItem(String dn, final Attributes attrs, Vector respCtls)
+ throws NamingException {
+
+ Object obj = null;
+@@ -110,8 +116,16 @@
+ if (attrs.get(Obj.JAVA_ATTRIBUTES[Obj.CLASSNAME]) != null) {
+ // Entry contains Java-object attributes (ser/ref object)
+ // serialized object or object reference
+- obj = Obj.decodeObject(attrs);
+-
++ try {
++ obj = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
++ @Override
++ public Object run() throws NamingException {
++ return Obj.decodeObject(attrs);
++ }
++ }, acc);
++ } catch (PrivilegedActionException e) {
++ throw (NamingException)e.getException();
++ }
+ }
+ if (obj == null) {
+ obj = new LdapCtx(homeCtx, dn);
--- jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2013-09-06 11:27:58.000000000 -0700
-+++ jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2013-12-01 11:14:38.000000000 -0800
++++ jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2014-04-20 12:39:21.000000000 -0700
@@ -25,11 +25,12 @@
package com.sun.jndi.ldap;
@@ -45128,7 +30262,7 @@
}
}
--- jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2013-09-06 11:27:59.000000000 -0700
-+++ jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2013-12-01 11:14:38.000000000 -0800
++++ jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2014-04-20 12:39:21.000000000 -0700
@@ -66,6 +66,11 @@
* cannot be created, opened, or written to.
* @throws UnsupportedOperationException if this operation is not supported.
@@ -45141,8 +30275,195 @@
*/
public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
+--- jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2013-09-06 11:27:59.000000000 -0700
++++ jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-04-20 12:39:21.000000000 -0700
+@@ -25,27 +25,33 @@
+
+ package com.sun.media.sound;
+
++import java.util.ArrayList;
+ import java.util.Collections;
+-import java.util.HashMap;
+ import java.util.List;
+-import java.util.Map;
+ import java.util.Properties;
+
+ import javax.sound.midi.Receiver;
+ import javax.sound.midi.Sequencer;
+ import javax.sound.midi.Synthesizer;
+ import javax.sound.midi.Transmitter;
++import javax.sound.midi.spi.MidiDeviceProvider;
++import javax.sound.midi.spi.MidiFileReader;
++import javax.sound.midi.spi.MidiFileWriter;
++import javax.sound.midi.spi.SoundbankReader;
+ import javax.sound.sampled.Clip;
+ import javax.sound.sampled.Port;
+ import javax.sound.sampled.SourceDataLine;
+ import javax.sound.sampled.TargetDataLine;
++import javax.sound.sampled.spi.AudioFileReader;
++import javax.sound.sampled.spi.AudioFileWriter;
++import javax.sound.sampled.spi.FormatConversionProvider;
++import javax.sound.sampled.spi.MixerProvider;
+
+
+ /**
+- * JDK13Services uses the Service class in JDK 1.3
+- * to discover a list of service providers installed
+- * in the system.
+- *
++ * JDK13Services uses the Service class in JDK 1.3 to discover a list of service
++ * providers installed in the system.
++ * <p>
+ * This class is public because it is called from javax.sound.midi.MidiSystem
+ * and javax.sound.sampled.AudioSystem. The alternative would be to make
+ * JSSecurityManager public, which is considered worse.
+@@ -54,80 +60,55 @@
+ */
+ public final class JDK13Services {
+
+- /** The default for the length of the period to hold the cache.
+- This value is given in milliseconds. It is equivalent to
+- 1 minute.
+- */
+- private static final long DEFAULT_CACHING_PERIOD = 60000;
+-
+- /** Filename of the properties file for default provider properties.
+- This file is searched in the subdirectory "lib" of the JRE directory
+- (this behaviour is hardcoded).
+- */
++ /**
++ * Filename of the properties file for default provider properties. This
++ * file is searched in the subdirectory "lib" of the JRE directory (this
++ * behaviour is hardcoded).
++ */
+ private static final String PROPERTIES_FILENAME = "sound.properties";
+
+- /** Cache for the providers.
+- Class objects of the provider type (MixerProvider, MidiDeviceProvider
+- ...) are used as keys. The values are instances of ProviderCache.
+- */
+- private static final Map providersCacheMap = new HashMap();
+-
+-
+- /** The length of the period to hold the cache.
+- This value is given in milliseconds.
+- */
+- private static long cachingPeriod = DEFAULT_CACHING_PERIOD;
+-
+- /** Properties loaded from the properties file for default provider
+- properties.
+- */
++ /**
++ * Properties loaded from the properties file for default provider
++ * properties.
++ */
+ private static Properties properties;
+
+-
+- /** Private, no-args constructor to ensure against instantiation.
++ /**
++ * Private, no-args constructor to ensure against instantiation.
+ */
+ private JDK13Services() {
+ }
+
+-
+- /** Set the period provider lists are cached.
+- This method is only intended for testing.
+- */
+- public static void setCachingPeriod(int seconds) {
+- cachingPeriod = seconds * 1000L;
+- }
+-
+-
+- /** Obtains a List containing installed instances of the
+- providers for the requested service.
+- The List of providers is cached for the period of time given by
+- {@link #cachingPeriod cachingPeriod}. During this period, the same
+- List instance is returned for the same type of provider. After this
+- period, a new instance is constructed and returned. The returned
+- List is immutable.
+- @param serviceClass The type of providers requested. This should be one
+- of AudioFileReader.class, AudioFileWriter.class,
+- FormatConversionProvider.class, MixerProvider.class,
+- MidiDeviceProvider.class, MidiFileReader.class, MidiFileWriter.class or
+- SoundbankReader.class.
+- @return A List of providers of the requested type. This List is
+- immutable.
+- */
+- public static synchronized List getProviders(Class serviceClass) {
+- ProviderCache cache = (ProviderCache) providersCacheMap.get(serviceClass);
+- if (cache == null) {
+- cache = new ProviderCache();
+- providersCacheMap.put(serviceClass, cache);
+- }
+- if (cache.providers == null ||
+- System.currentTimeMillis() > cache.lastUpdate + cachingPeriod) {
+- cache.providers = Collections.unmodifiableList(JSSecurityManager.getProviders(serviceClass));
+- cache.lastUpdate = System.currentTimeMillis();
++ /**
++ * Obtains a List containing installed instances of the providers for the
++ * requested service. The returned List is immutable.
++ *
++ * @param serviceClass The type of providers requested. This should be one
++ * of AudioFileReader.class, AudioFileWriter.class,
++ * FormatConversionProvider.class, MixerProvider.class,
++ * MidiDeviceProvider.class, MidiFileReader.class,
++ * MidiFileWriter.class or SoundbankReader.class.
++ *
++ * @return A List of providers of the requested type. This List is
++ * immutable.
++ */
++ public static List<?> getProviders(final Class<?> serviceClass) {
++ final List<?> providers;
++ if (!MixerProvider.class.equals(serviceClass)
++ && !FormatConversionProvider.class.equals(serviceClass)
++ && !AudioFileReader.class.equals(serviceClass)
++ && !AudioFileWriter.class.equals(serviceClass)
++ && !MidiDeviceProvider.class.equals(serviceClass)
++ && !SoundbankReader.class.equals(serviceClass)
++ && !MidiFileWriter.class.equals(serviceClass)
++ && !MidiFileReader.class.equals(serviceClass)) {
++ providers = new ArrayList<>(0);
++ } else {
++ providers = JSSecurityManager.getProviders(serviceClass);
+ }
+- return cache.providers;
++ return Collections.unmodifiableList(providers);
+ }
+
+-
+ /** Obtain the provider class name part of a default provider property.
+ @param typeClass The type of the default provider property. This
+ should be one of Receiver.class, Transmitter.class, Sequencer.class,
+@@ -219,14 +200,4 @@
+ }
+ return properties;
+ }
+-
+- // INNER CLASSES
+-
+- private static class ProviderCache {
+- // System time of the last update in milliseconds.
+- public long lastUpdate;
+-
+- // The providers.
+- public List providers;
+- }
+ }
+--- jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java 2013-09-06 11:27:59.000000000 -0700
++++ jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java 2014-04-20 12:39:21.000000000 -0700
+@@ -187,7 +187,7 @@
+ return thread;
+ }
+
+- static List getProviders(final Class providerClass) {
++ static synchronized List getProviders(final Class providerClass) {
+ List p = new ArrayList();
+ // Service.providers(Class) just creates "lazy" iterator instance,
+ // so it doesn't require do be called from privileged section
--- jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
@@ -45189,8 +30510,39 @@
}
// Instantiate Class to get factory
answer = ((Class) answer).newInstance();
+--- jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2013-09-06 11:28:00.000000000 -0700
++++ jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2014-04-20 12:39:21.000000000 -0700
+@@ -69,6 +69,14 @@
+ private static final String JRELIB_PROPERTY_FILE_NAME = "jndi.properties";
+
+ /*
++ * Internal environment property, that when set to "true", disables
++ * application resource files lookup to prevent recursion issues
++ * when validating signed JARs.
++ */
++ private static final String DISABLE_APP_RESOURCE_FILES =
++ "com.sun.naming.disable.app.resource.files";
++
++ /*
+ * The standard JNDI properties that specify colon-separated lists.
+ */
+ private static final String[] listProperties = {
+@@ -218,6 +226,13 @@
+ }
+ }
+
++ // Return without merging if application resource files lookup
++ // is disabled.
++ String disableAppRes = (String)env.get(DISABLE_APP_RESOURCE_FILES);
++ if (disableAppRes != null && disableAppRes.equalsIgnoreCase("true")) {
++ return env;
++ }
++
+ // Merge the above with the values read from all application
+ // resource files. Colon-separated lists are concatenated.
+ mergeTables(env, getApplicationResources());
--- jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -45307,7 +30659,7 @@
* Given an enumeration of URLs, an instance of this class represents
* an enumeration of their InputStreams. Each operation on the URL
--- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2014-04-20 12:39:21.000000000 -0700
@@ -358,7 +358,8 @@
} else if (!isVisible(xmlns)) {
// There is a defn but the xmlns is not selected by the xpath.
@@ -45319,7 +30671,7 @@
// output the xmlns def if needed.
if (n != null) {
--- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2014-04-20 12:39:21.000000000 -0700
@@ -302,7 +302,8 @@
} else if ( !isVisible(xmlns)) {
//There is a definition but the xmlns is not selected by the xpath.
@@ -45331,7 +30683,7 @@
//output the xmlns def if needed.
if (n!=null) {
--- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2014-04-20 12:39:21.000000000 -0700
@@ -300,7 +300,7 @@
if ((xmlns!=null) && (!isVisible(xmlns))) {
//There is a definition but the xmlns is not selected by the xpath.
@@ -45342,7 +30694,7 @@
if (E.getNamespaceURI() != null) {
--- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2013-09-06 11:28:00.000000000 -0700
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2014-04-20 12:39:21.000000000 -0700
@@ -34,7 +34,6 @@
import java.util.Map;
import java.util.Set;
@@ -45609,7 +30961,7 @@
+
}
--- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2013-09-06 11:28:02.000000000 -0700
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2013-12-01 11:14:38.000000000 -0800
++++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2014-04-20 12:39:21.000000000 -0700
@@ -44,6 +44,9 @@
}
@@ -45653,8 +31005,59 @@
}
byte newBuf[] = new byte[newSize];
System.arraycopy(buf, 0, newBuf, 0, pos);
+--- jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-09-06 11:28:02.000000000 -0700
++++ jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -37,6 +37,7 @@
+ import javax.sql.rowset.serial.*;
+ import com.sun.rowset.internal.*;
+ import com.sun.rowset.providers.*;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * The standard implementation of the <code>CachedRowSet</code> interface.
+@@ -2963,13 +2964,9 @@
+ // create new instance of the class
+ SQLData obj = null;
+ try {
+- obj = (SQLData)c.newInstance();
+- } catch (java.lang.InstantiationException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
+- } catch (java.lang.IllegalAccessException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
++ obj = (SQLData) ReflectUtil.newInstance(c);
++ } catch(Exception ex) {
++ throw new SQLException("Unable to Instantiate: ", ex);
+ }
+ // get the attributes from the struct
+ Object attribs[] = s.getAttributes(map);
+@@ -5714,13 +5711,9 @@
+ // create new instance of the class
+ SQLData obj = null;
+ try {
+- obj = (SQLData)c.newInstance();
+- } catch (java.lang.InstantiationException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
+- } catch (java.lang.IllegalAccessException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
++ obj = (SQLData) ReflectUtil.newInstance(c);
++ } catch(Exception ex) {
++ throw new SQLException("Unable to Instantiate: ", ex);
+ }
+ // get the attributes from the struct
+ Object attribs[] = s.getAttributes(map);
--- jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2013-09-06 11:28:02.000000000 -0700
-+++ jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2014-04-20 12:39:22.000000000 -0700
@@ -44,7 +44,7 @@
cachedrowsetimpl.dtypemismt = \uB370\uC774\uD130 \uC720\uD615\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
cachedrowsetimpl.datefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getDate\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -45682,8 +31085,42 @@
xmlrch.chars = \uBB38\uC790:
xmlrch.badvalue = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uC18D\uC131\uC785\uB2C8\uB2E4.
xmlrch.badvalue1 = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uBA54\uD0C0 \uB370\uC774\uD130\uC785\uB2C8\uB2E4.
+--- jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java 2013-09-06 11:28:02.000000000 -0700
++++ jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -39,6 +39,7 @@
+ import javax.sql.rowset.serial.SerialClob;
+ import javax.sql.rowset.serial.SerialStruct;
+ import javax.sql.rowset.spi.*;
++import sun.reflect.misc.ReflectUtil;
+
+
+ /**
+@@ -578,13 +579,9 @@
+ // create new instance of the class
+ SQLData obj = null;
+ try {
+- obj = (SQLData)c.newInstance();
+- } catch (java.lang.InstantiationException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
+- } catch (java.lang.IllegalAccessException ex) {
+- throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.unableins").toString(),
+- ex.getMessage()));
++ obj = (SQLData)ReflectUtil.newInstance(c);
++ } catch (Exception ex) {
++ throw new SQLException("Unable to Instantiate: ", ex);
+ }
+ // get the attributes from the struct
+ Object attribs[] = s.getAttributes(map);
--- jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2013-09-06 11:28:02.000000000 -0700
-+++ jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2014-04-20 12:39:22.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -45701,7 +31138,7 @@
}catch(ClassNotFoundException ex) {
throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage()));
--- jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2013-09-06 11:28:02.000000000 -0700
-+++ jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2014-04-20 12:39:22.000000000 -0700
@@ -28,6 +28,7 @@
import javax.script.*;
import java.lang.reflect.*;
@@ -45752,7 +31189,7 @@
+ }
}
--- jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2013-09-06 11:28:03.000000000 -0700
-+++ jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2014-04-20 12:39:22.000000000 -0700
@@ -46,7 +46,7 @@
FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O)
FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
@@ -45772,7 +31209,7 @@
FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
--- jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2013-09-06 11:28:03.000000000 -0700
-+++ jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2014-04-20 12:39:22.000000000 -0700
@@ -20,8 +20,8 @@
FileChooser.lookInLabel.textAndMnemonic=Leta &i:
@@ -45785,7 +31222,7 @@
FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
FileChooser.upFolderAccessibleName=Upp
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2014-04-20 12:39:22.000000000 -0700
@@ -84,7 +84,7 @@
lastPackage = pkg;
printClass(clazz);
@@ -45796,7 +31233,7 @@
out.println("<br>");
}
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2014-04-20 12:39:22.000000000 -0700
@@ -112,12 +112,12 @@
out.println("<h2>Instances</h2>");
@@ -45836,7 +31273,7 @@
out.println("References summary by type</a>");
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2014-04-20 12:39:22.000000000 -0700
@@ -41,21 +41,17 @@
@@ -45879,7 +31316,7 @@
}
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2014-04-20 12:39:22.000000000 -0700
@@ -102,7 +102,7 @@
int count = clazz.getInstancesCount(false);
print("" + count);
@@ -45899,7 +31336,7 @@
print("" + newInst + " new");
out.print("</a>) ");
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2014-04-20 12:39:22.000000000 -0700
@@ -54,10 +54,7 @@
out.print((char)ch);
}
@@ -45913,7 +31350,7 @@
}
}
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2014-04-20 12:39:22.000000000 -0700
@@ -32,10 +32,7 @@
package com.sun.tools.hat.internal.server;
@@ -45959,7 +31396,7 @@
}
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2014-04-20 12:39:22.000000000 -0700
@@ -36,6 +36,7 @@
import com.sun.tools.hat.internal.model.*;
@@ -46011,7 +31448,7 @@
+ }
}
--- jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2013-09-06 11:28:04.000000000 -0700
-+++ jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2014-04-20 12:39:22.000000000 -0700
@@ -89,7 +89,7 @@
out.println("<p align='center'>");
printClass(clazz);
@@ -46033,8 +31470,41 @@
out.println("</a>");
out.println("</td><td>");
out.println(map.get(clazz));
+--- jdk/src/share/classes/java/awt/EventQueue.java 2013-09-06 11:28:05.000000000 -0700
++++ jdk/src/share/classes/java/awt/EventQueue.java 2014-04-20 12:39:18.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -1043,11 +1043,11 @@
+ t.setContextClassLoader(classLoader);
+ t.setPriority(Thread.NORM_PRIORITY + 1);
+ t.setDaemon(false);
++ AWTAutoShutdown.getInstance().notifyThreadBusy(t);
+ return t;
+ }
+ }
+ );
+- AWTAutoShutdown.getInstance().notifyThreadBusy(dispatchThread);
+ dispatchThread.start();
+ }
+ } finally {
+@@ -1139,6 +1139,10 @@
+ if (entry.event instanceof SentEvent) {
+ ((SentEvent)entry.event).dispose();
+ }
++ if (entry.event instanceof InvocationEvent) {
++ AWTAccessor.getInvocationEventAccessor()
++ .dispose((InvocationEvent)entry.event);
++ }
+ if (prev == null) {
+ queues[i].head = entry.next;
+ } else {
--- jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2013-09-06 11:28:06.000000000 -0700
-+++ jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2014-04-20 12:39:18.000000000 -0700
@@ -25,12 +25,14 @@
package java.awt.datatransfer;
@@ -46103,8 +31573,269 @@
}
/*
+--- jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java 2013-09-06 11:28:06.000000000 -0700
++++ jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java 2014-04-20 12:39:18.000000000 -0700
+@@ -45,8 +45,8 @@
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+-import java.util.WeakHashMap;
+
++import sun.awt.AppContext;
+ import sun.awt.datatransfer.DataTransferer;
+
+ /**
+@@ -72,10 +72,7 @@
+ */
+ private static String JavaMIME = "JAVA_DATAFLAVOR:";
+
+- /**
+- * System singleton which maps a thread's ClassLoader to a SystemFlavorMap.
+- */
+- private static final WeakHashMap flavorMaps = new WeakHashMap();
++ private static final Object FLAVOR_MAP_KEY = new Object();
+
+ /**
+ * Copied from java.util.Properties.
+@@ -184,22 +181,12 @@
+ * Returns the default FlavorMap for this thread's ClassLoader.
+ */
+ public static FlavorMap getDefaultFlavorMap() {
+- ClassLoader contextClassLoader =
+- Thread.currentThread().getContextClassLoader();
+- if (contextClassLoader == null) {
+- contextClassLoader = ClassLoader.getSystemClassLoader();
+- }
+-
+- FlavorMap fm;
+-
+- synchronized(flavorMaps) {
+- fm = (FlavorMap)flavorMaps.get(contextClassLoader);
+- if (fm == null) {
+- fm = new SystemFlavorMap();
+- flavorMaps.put(contextClassLoader, fm);
+- }
++ AppContext context = AppContext.getAppContext();
++ FlavorMap fm = (FlavorMap) context.get(FLAVOR_MAP_KEY);
++ if (fm == null) {
++ fm = new SystemFlavorMap();
++ context.put(FLAVOR_MAP_KEY, fm);
+ }
+-
+ return fm;
+ }
+
+@@ -240,26 +227,11 @@
+ }
+ });
+
+- BufferedReader flavormapURL =
++ String url =
+ java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction<BufferedReader>() {
+- public BufferedReader run() {
+- String url = Toolkit.getProperty("AWT.DnD.flavorMapFileURL", null);
+-
+- if (url == null) {
+- return null;
+- }
+-
+- try {
+- return new BufferedReader
+- (new InputStreamReader
+- (new URL(url).openStream(), "ISO-8859-1"));
+- } catch (MalformedURLException e) {
+- System.err.println("MalformedURLException:" + e + " while reading AWT.DnD.flavorMapFileURL:" + url);
+- } catch (IOException e) {
+- System.err.println("IOException:" + e + " while reading AWT.DnD.flavorMapFileURL:" + url);
+- }
+- return null;
++ new java.security.PrivilegedAction<String>() {
++ public String run() {
++ return Toolkit.getProperty("AWT.DnD.flavorMapFileURL", null);
+ }
+ });
+
+@@ -271,6 +243,19 @@
+ }
+ }
+
++ BufferedReader flavormapURL = null;
++ if (url != null) {
++ try {
++ flavormapURL = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "ISO-8859-1"));
++ } catch (MalformedURLException e) {
++ System.err.println("MalformedURLException:" + e + " while reading AWT.DnD.flavorMapFileURL:" + url);
++ } catch (IOException e) {
++ System.err.println("IOException:" + e + " while reading AWT.DnD.flavorMapFileURL:" + url);
++ } catch (SecurityException e) {
++ // ignored
++ }
++ }
++
+ if (flavormapURL != null) {
+ try {
+ parseAndStoreReader(flavormapURL);
+--- jdk/src/share/classes/java/awt/event/InvocationEvent.java 2013-09-06 11:28:07.000000000 -0700
++++ jdk/src/share/classes/java/awt/event/InvocationEvent.java 2014-04-20 12:39:18.000000000 -0700
+@@ -25,6 +25,8 @@
+
+ package java.awt.event;
+
++import sun.awt.AWTAccessor;
++
+ import java.awt.ActiveEvent;
+ import java.awt.AWTEvent;
+
+@@ -56,6 +58,20 @@
+ */
+ public class InvocationEvent extends AWTEvent implements ActiveEvent {
+
++ static {
++ AWTAccessor.setInvocationEventAccessor(new AWTAccessor.InvocationEventAccessor() {
++ @Override
++ public void dispose(InvocationEvent invocationEvent) {
++ invocationEvent.finishedDispatching(false);
++ }
++ @Override
++ public InvocationEvent createEvent(Object source, Runnable runnable, Runnable listener,
++ boolean catchThrowables) {
++ return new InvocationEvent(source, runnable, listener, catchThrowables);
++ }
++ });
++ }
++
+ /**
+ * Marks the first integer id for the range of invocation event ids.
+ */
+@@ -85,6 +101,14 @@
+ protected Object notifier;
+
+ /**
++ * The (potentially null) Runnable whose run() method will be called
++ * immediately after the event was dispatched or disposed.
++ *
++ * @see #isDispatched
++ */
++ private final Runnable listener;
++
++ /**
+ * Indicates whether the <code>run()</code> method of the <code>runnable</code>
+ * was executed or not.
+ *
+@@ -147,7 +171,7 @@
+ * @see #InvocationEvent(Object, Runnable, Object, boolean)
+ */
+ public InvocationEvent(Object source, Runnable runnable) {
+- this(source, runnable, null, false);
++ this(source, INVOCATION_DEFAULT, runnable, null, null, false);
+ }
+
+ /**
+@@ -185,7 +209,39 @@
+ */
+ public InvocationEvent(Object source, Runnable runnable, Object notifier,
+ boolean catchThrowables) {
+- this(source, INVOCATION_DEFAULT, runnable, notifier, catchThrowables);
++ this(source, INVOCATION_DEFAULT, runnable, notifier, null, catchThrowables);
++ }
++
++ /**
++ * Constructs an <code>InvocationEvent</code> with the specified
++ * source which will execute the runnable's <code>run</code>
++ * method when dispatched. If listener is non-<code>null</code>,
++ * <code>listener.run()</code> will be called immediately after
++ * <code>run</code> has returned, thrown an exception or the event
++ * was disposed.
++ * <p>This method throws an <code>IllegalArgumentException</code>
++ * if <code>source</code> is <code>null</code>.
++ *
++ * @param source The <code>Object</code> that originated
++ * the event
++ * @param runnable The <code>Runnable</code> whose
++ * <code>run</code> method will be
++ * executed
++ * @param listener The <code>Runnable</code>Runnable whose
++ * <code>run()</code> method will be called
++ * after the {@code InvocationEvent}
++ * was dispatched or disposed
++ * @param catchThrowables Specifies whether <code>dispatch</code>
++ * should catch Throwable when executing
++ * the <code>Runnable</code>'s <code>run</code>
++ * method, or should instead propagate those
++ * Throwables to the EventDispatchThread's
++ * dispatch loop
++ * @throws IllegalArgumentException if <code>source</code> is null
++ */
++ private InvocationEvent(Object source, Runnable runnable, Runnable listener,
++ boolean catchThrowables) {
++ this(source, INVOCATION_DEFAULT, runnable, null, listener, catchThrowables);
+ }
+
+ /**
+@@ -221,13 +277,18 @@
+ */
+ protected InvocationEvent(Object source, int id, Runnable runnable,
+ Object notifier, boolean catchThrowables) {
++ this(source, id, runnable, notifier, null, catchThrowables);
++ }
++
++ private InvocationEvent(Object source, int id, Runnable runnable,
++ Object notifier, Runnable listener, boolean catchThrowables) {
+ super(source, id);
+ this.runnable = runnable;
+ this.notifier = notifier;
++ this.listener = listener;
+ this.catchExceptions = catchThrowables;
+ this.when = System.currentTimeMillis();
+ }
+-
+ /**
+ * Executes the Runnable's <code>run()</code> method and notifies the
+ * notifier (if any) when <code>run()</code> has returned or thrown an exception.
+@@ -251,13 +312,7 @@
+ runnable.run();
+ }
+ } finally {
+- dispatched = true;
+-
+- if (notifier != null) {
+- synchronized (notifier) {
+- notifier.notifyAll();
+- }
+- }
++ finishedDispatching(true);
+ }
+ }
+
+@@ -331,6 +386,25 @@
+ }
+
+ /**
++ * Called when the event was dispatched or disposed
++ * @param dispatched true if the event was dispatched
++ * false if the event was disposed
++ */
++ private void finishedDispatching(boolean dispatched) {
++ this.dispatched = dispatched;
++
++ if (notifier != null) {
++ synchronized (notifier) {
++ notifier.notifyAll();
++ }
++ }
++
++ if (listener != null) {
++ listener.run();
++ }
++ }
++
++ /**
+ * Returns a parameter string identifying this event.
+ * This method is useful for event-logging and for debugging.
+ *
--- jdk/src/share/classes/java/beans/Beans.java 2013-09-06 11:28:08.000000000 -0700
-+++ jdk/src/share/classes/java/beans/Beans.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/java/beans/Beans.java 2014-04-20 12:39:18.000000000 -0700
@@ -42,6 +42,8 @@
import java.io.ObjectStreamClass;
import java.io.StreamCorruptedException;
@@ -46126,7 +31857,7 @@
* Try to instantiate the class.
*/
--- jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2013-09-06 11:28:08.000000000 -0700
-+++ jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2014-04-20 12:39:18.000000000 -0700
@@ -220,6 +220,9 @@
// Write out the properties of this instance.
private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) {
@@ -46138,7 +31869,7 @@
if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
continue;
--- jdk/src/share/classes/java/beans/MetaData.java 2013-09-06 11:28:08.000000000 -0700
-+++ jdk/src/share/classes/java/beans/MetaData.java 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/classes/java/beans/MetaData.java 2014-04-20 12:39:18.000000000 -0700
@@ -42,6 +42,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -46180,7 +31911,7 @@
}
}
--- jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-09-06 11:28:08.000000000 -0700
-+++ jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-04-20 12:39:18.000000000 -0700
@@ -41,24 +41,20 @@
*/
final class ThreadGroupContext {
@@ -46214,7 +31945,7 @@
private volatile boolean isDesignTime;
--- jdk/src/share/classes/java/beans/WeakIdentityMap.java 2013-09-06 11:28:08.000000000 -0700
-+++ jdk/src/share/classes/java/beans/WeakIdentityMap.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/beans/WeakIdentityMap.java 2014-04-20 12:39:18.000000000 -0700
@@ -33,18 +33,22 @@
* and reference-equality in place of object-equality to compare them.
* An entry will automatically be removed when its key is no longer
@@ -46393,7 +32124,7 @@
Entry(Object key, int hash, T value, ReferenceQueue<Object> queue, Entry<T> next) {
super(key, queue);
--- jdk/src/share/classes/java/io/File.java 2013-09-06 11:28:09.000000000 -0700
-+++ jdk/src/share/classes/java/io/File.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/io/File.java 2014-04-20 12:39:18.000000000 -0700
@@ -1885,10 +1885,18 @@
} else {
n = Math.abs(n);
@@ -46416,7 +32147,7 @@
}
}
--- jdk/src/share/classes/java/io/ObjectInputStream.java 2013-09-06 11:28:09.000000000 -0700
-+++ jdk/src/share/classes/java/io/ObjectInputStream.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/io/ObjectInputStream.java 2014-04-20 12:39:18.000000000 -0700
@@ -490,11 +490,12 @@
public void defaultReadObject()
throws IOException, ClassNotFoundException
@@ -46458,7 +32189,7 @@
if (cl != null && obj != null && !cl.isInstance(obj)) {
throw new ClassCastException();
--- jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-09-06 11:28:09.000000000 -0700
-+++ jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-04-20 12:39:18.000000000 -0700
@@ -430,11 +430,12 @@
* <code>OutputStream</code>
*/
@@ -46505,7 +32236,7 @@
int primDataSize = desc.getPrimDataSize();
--- jdk/src/share/classes/java/lang/Class.java 2013-09-06 11:28:09.000000000 -0700
-+++ jdk/src/share/classes/java/lang/Class.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/Class.java 2014-04-20 12:39:18.000000000 -0700
@@ -1096,7 +1096,17 @@
* @return the declaring class for this class
* @since JDK1.1
@@ -46526,7 +32257,7 @@
/**
--- jdk/src/share/classes/java/lang/ClassLoader.java 2013-09-06 11:28:09.000000000 -0700
-+++ jdk/src/share/classes/java/lang/ClassLoader.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/ClassLoader.java 2014-04-20 12:39:18.000000000 -0700
@@ -58,6 +58,7 @@
import sun.misc.VM;
import sun.reflect.CallerSensitive;
@@ -46550,7 +32281,7 @@
final int i = name.lastIndexOf('.');
if (i != -1) {
--- jdk/src/share/classes/java/lang/SecurityManager.java 2013-09-06 11:28:10.000000000 -0700
-+++ jdk/src/share/classes/java/lang/SecurityManager.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/lang/SecurityManager.java 2014-04-20 12:39:18.000000000 -0700
@@ -1131,12 +1131,8 @@
* @see #checkPermission(java.security.Permission) checkPermission
*/
@@ -46567,7 +32298,7 @@
/**
--- jdk/src/share/classes/java/lang/System.java 2013-09-06 11:28:10.000000000 -0700
-+++ jdk/src/share/classes/java/lang/System.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/System.java 2014-04-20 12:39:18.000000000 -0700
@@ -25,6 +25,7 @@
package java.lang;
@@ -46587,7 +32318,7 @@
}
}
--- jdk/src/share/classes/java/lang/Thread.java 2013-09-06 11:28:10.000000000 -0700
-+++ jdk/src/share/classes/java/lang/Thread.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/Thread.java 2014-04-20 12:39:18.000000000 -0700
@@ -341,6 +341,15 @@
}
@@ -46604,7 +32335,7 @@
* Initializes a Thread.
*
* @param g the Thread group
-@@ -348,9 +357,11 @@
+@@ -348,13 +357,17 @@
* @param name the name of the new Thread
* @param stackSize the desired stack size for the new thread, or
* zero to indicate that this parameter is to be ignored.
@@ -46617,7 +32348,18 @@
if (name == null) {
throw new NullPointerException("name cannot be null");
}
-@@ -396,7 +407,8 @@
+
++ this.name = name.toCharArray();
++
+ Thread parent = currentThread();
+ SecurityManager security = System.getSecurityManager();
+ if (g == null) {
+@@ -391,12 +404,12 @@
+ this.group = g;
+ this.daemon = parent.isDaemon();
+ this.priority = parent.getPriority();
+- this.name = name.toCharArray();
+ if (security == null || isCCLOverridden(parent.getClass()))
this.contextClassLoader = parent.getContextClassLoader();
else
this.contextClassLoader = parent.contextClassLoader;
@@ -46627,7 +32369,7 @@
this.target = target;
setPriority(priority);
if (parent.inheritableThreadLocals != null)
-@@ -449,6 +461,14 @@
+@@ -449,6 +462,14 @@
}
/**
@@ -46642,8 +32384,246 @@
* Allocates a new {@code Thread} object. This constructor has the same
* effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
* {@code (group, target, gname)} ,where {@code gname} is a newly generated
+--- jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-09-06 11:28:10.000000000 -0700
++++ jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-04-20 12:39:18.000000000 -0700
+@@ -140,7 +140,7 @@
+ * Return the {@link SpeciesData} instance representing this BMH species. All subclasses must provide a
+ * static field containing this value, and they must accordingly implement this method.
+ */
+- protected abstract SpeciesData speciesData();
++ /*non-public*/ abstract SpeciesData speciesData();
+
+ @Override
+ final Object internalProperties() {
+@@ -156,7 +156,7 @@
+ return Arrays.asList(boundValues);
+ }
+
+- public final Object arg(int i) {
++ /*non-public*/ final Object arg(int i) {
+ try {
+ switch (speciesData().fieldType(i)) {
+ case 'L': return argL(i);
+@@ -170,22 +170,22 @@
+ }
+ throw new InternalError("unexpected type: " + speciesData().types+"."+i);
+ }
+- public final Object argL(int i) throws Throwable { return speciesData().getters[i].invokeBasic(this); }
+- public final int argI(int i) throws Throwable { return (int) speciesData().getters[i].invokeBasic(this); }
+- public final float argF(int i) throws Throwable { return (float) speciesData().getters[i].invokeBasic(this); }
+- public final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
+- public final long argJ(int i) throws Throwable { return (long) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final Object argL(int i) throws Throwable { return speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final int argI(int i) throws Throwable { return (int) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final float argF(int i) throws Throwable { return (float) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final long argJ(int i) throws Throwable { return (long) speciesData().getters[i].invokeBasic(this); }
+
+ //
+ // cloning API
+ //
+
+- public abstract BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable;
+- public abstract BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable;
+- public abstract BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable;
+- public abstract BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable;
+- public abstract BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable;
+- public abstract BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable;
++ /*non-public*/ abstract BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable;
+
+ // The following is a grossly irregular hack:
+ @Override MethodHandle reinvokerTarget() {
+@@ -203,39 +203,39 @@
+ private // make it private to force users to access the enclosing class first
+ static final class Species_L extends BoundMethodHandle {
+ final Object argL0;
+- public Species_L(MethodType mt, LambdaForm lf, Object argL0) {
++ /*non-public*/ Species_L(MethodType mt, LambdaForm lf, Object argL0) {
+ super(mt, lf);
+ this.argL0 = argL0;
+ }
+ // The following is a grossly irregular hack:
+ @Override MethodHandle reinvokerTarget() { return (MethodHandle) argL0; }
+ @Override
+- public SpeciesData speciesData() {
++ /*non-public*/ SpeciesData speciesData() {
+ return SPECIES_DATA;
+ }
+- public static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("L", Species_L.class);
++ /*non-public*/ static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("L", Species_L.class);
+ @Override
+- public final BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable {
++ /*non-public*/ final BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable {
+ return new Species_L(mt, lf, argL0);
+ }
+ @Override
+- public final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable {
++ /*non-public*/ final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable {
+ return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_L).constructor[0].invokeBasic(mt, lf, argL0, narg);
+ }
+ @Override
+- public final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable {
++ /*non-public*/ final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable {
+ return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_I).constructor[0].invokeBasic(mt, lf, argL0, narg);
+ }
+ @Override
+- public final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable {
++ /*non-public*/ final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable {
+ return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_J).constructor[0].invokeBasic(mt, lf, argL0, narg);
+ }
+ @Override
+- public final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable {
++ /*non-public*/ final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable {
+ return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_F).constructor[0].invokeBasic(mt, lf, argL0, narg);
+ }
+ @Override
+- public final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable {
++ /*non-public*/ final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable {
+ return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_D).constructor[0].invokeBasic(mt, lf, argL0, narg);
+ }
+ }
+@@ -338,10 +338,10 @@
+ final MethodHandle[] getters;
+ final SpeciesData[] extensions;
+
+- public int fieldCount() {
++ /*non-public*/ int fieldCount() {
+ return types.length();
+ }
+- public char fieldType(int i) {
++ /*non-public*/ char fieldType(int i) {
+ return types.charAt(i);
+ }
+
+@@ -546,30 +546,30 @@
+ * final Object argL0;
+ * final Object argL1;
+ * final int argI2;
+- * public Species_LLI(MethodType mt, LambdaForm lf, Object argL0, Object argL1, int argI2) {
++ * Species_LLI(MethodType mt, LambdaForm lf, Object argL0, Object argL1, int argI2) {
+ * super(mt, lf);
+ * this.argL0 = argL0;
+ * this.argL1 = argL1;
+ * this.argI2 = argI2;
+ * }
+- * public final SpeciesData speciesData() { return SPECIES_DATA; }
+- * public static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("LLI", Species_LLI.class);
+- * public final BoundMethodHandle clone(MethodType mt, LambdaForm lf) {
++ * final SpeciesData speciesData() { return SPECIES_DATA; }
++ * static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("LLI", Species_LLI.class);
++ * final BoundMethodHandle clone(MethodType mt, LambdaForm lf) {
+ * return SPECIES_DATA.constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2);
+ * }
+- * public final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) {
++ * final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) {
+ * return SPECIES_DATA.extendWithIndex(INDEX_L).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
+ * }
+- * public final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) {
++ * final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) {
+ * return SPECIES_DATA.extendWithIndex(INDEX_I).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
+ * }
+- * public final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) {
++ * final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) {
+ * return SPECIES_DATA.extendWithIndex(INDEX_J).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
+ * }
+- * public final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) {
++ * final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) {
+ * return SPECIES_DATA.extendWithIndex(INDEX_F).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
+ * }
+- * public final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) {
++ * final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) {
+ * return SPECIES_DATA.extendWithIndex(INDEX_D).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
+ * }
+ * }
+@@ -583,11 +583,12 @@
+
+ final String className = SPECIES_PREFIX_PATH + types;
+ final String sourceFile = SPECIES_PREFIX_NAME + types;
+- cw.visit(V1_6, ACC_PUBLIC + ACC_FINAL + ACC_SUPER, className, null, BMH, null);
++ final int NOT_ACC_PUBLIC = 0; // not ACC_PUBLIC
++ cw.visit(V1_6, NOT_ACC_PUBLIC + ACC_FINAL + ACC_SUPER, className, null, BMH, null);
+ cw.visitSource(sourceFile, null);
+
+ // emit static types and SPECIES_DATA fields
+- cw.visitField(ACC_PUBLIC + ACC_STATIC, "SPECIES_DATA", SPECIES_DATA_SIG, null, null).visitEnd();
++ cw.visitField(NOT_ACC_PUBLIC + ACC_STATIC, "SPECIES_DATA", SPECIES_DATA_SIG, null, null).visitEnd();
+
+ // emit bound argument fields
+ for (int i = 0; i < types.length(); ++i) {
+@@ -600,7 +601,7 @@
+ MethodVisitor mv;
+
+ // emit constructor
+- mv = cw.visitMethod(ACC_PUBLIC, "<init>", makeSignature(types, true), null, null);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC, "<init>", makeSignature(types, true), null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitVarInsn(ALOAD, 1);
+@@ -624,7 +625,7 @@
+ mv.visitEnd();
+
+ // emit implementation of reinvokerTarget()
+- mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "reinvokerTarget", "()" + MH_SIG, null, null);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "reinvokerTarget", "()" + MH_SIG, null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitFieldInsn(GETFIELD, className, "argL0", JLO_SIG);
+@@ -634,7 +635,7 @@
+ mv.visitEnd();
+
+ // emit implementation of speciesData()
+- mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "speciesData", MYSPECIES_DATA_SIG, null, null);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "speciesData", MYSPECIES_DATA_SIG, null, null);
+ mv.visitCode();
+ mv.visitFieldInsn(GETSTATIC, className, "SPECIES_DATA", SPECIES_DATA_SIG);
+ mv.visitInsn(ARETURN);
+@@ -642,7 +643,7 @@
+ mv.visitEnd();
+
+ // emit clone()
+- mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "clone", makeSignature("", false), null, E_THROWABLE);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "clone", makeSignature("", false), null, E_THROWABLE);
+ mv.visitCode();
+ // return speciesData().constructor[0].invokeBasic(mt, lf, argL0, ...)
+ // obtain constructor
+@@ -665,7 +666,7 @@
+ // for each type, emit cloneExtendT()
+ for (Class<?> c : TYPES) {
+ char t = Wrapper.basicTypeChar(c);
+- mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "cloneExtend" + t, makeSignature(String.valueOf(t), false), null, E_THROWABLE);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "cloneExtend" + t, makeSignature(String.valueOf(t), false), null, E_THROWABLE);
+ mv.visitCode();
+ // return SPECIES_DATA.extendWithIndex(extensionIndex(t)).constructor[0].invokeBasic(mt, lf, argL0, ..., narg)
+ // obtain constructor
+@@ -692,7 +693,7 @@
+ }
+
+ // emit class initializer
+- mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "<clinit>", VOID_SIG, null, null);
++ mv = cw.visitMethod(NOT_ACC_PUBLIC | ACC_STATIC, "<clinit>", VOID_SIG, null, null);
+ mv.visitCode();
+ mv.visitLdcInsn(types);
+ mv.visitLdcInsn(Type.getObjectType(className));
+--- jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2013-09-06 11:28:10.000000000 -0700
++++ jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-04-20 12:39:18.000000000 -0700
+@@ -289,8 +289,9 @@
+ * Set up class file generation.
+ */
+ private void classFilePrologue() {
++ final int NOT_ACC_PUBLIC = 0; // not ACC_PUBLIC
+ cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES);
+- cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, className, null, superName, null);
++ cw.visit(Opcodes.V1_6, NOT_ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, className, null, superName, null);
+ cw.visitSource(sourceFile, null);
+
+ String invokerDesc = invokerType.toMethodDescriptorString();
--- jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-09-06 11:28:10.000000000 -0700
-+++ jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-04-20 12:39:18.000000000 -0700
@@ -456,6 +456,7 @@
case "getDeclaredField":
case "getDeclaredMethod":
@@ -46661,7 +32641,7 @@
case "newProxyInstance":
return defc == java.lang.reflect.Proxy.class;
--- jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2013-09-06 11:28:10.000000000 -0700
-+++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-04-20 12:39:18.000000000 -0700
@@ -426,7 +426,7 @@
Lookup(Class<?> lookupClass) {
@@ -46712,8 +32692,24 @@
MemberName method = (resolved != null) ? resolved
: resolveOrFail(refKind, defc, name, (MethodType) type);
return getDirectMethod(refKind, defc, method, lookupClass);
+@@ -1603,6 +1616,7 @@
+ */
+ public static
+ MethodHandle permuteArguments(MethodHandle target, MethodType newType, int... reorder) {
++ reorder = reorder.clone();
+ checkReorder(reorder, newType, target.type());
+ return target.permuteArguments(newType, reorder);
+ }
+@@ -1797,6 +1811,7 @@
+ throw newIllegalArgumentException("no argument type to remove");
+ ArrayList<Class<?>> ptypes = new ArrayList<>(oldType.parameterList());
+ ptypes.addAll(pos, valueTypes);
++ if (ptypes.size() != inargs) throw newIllegalArgumentException("valueTypes");
+ MethodType newType = MethodType.methodType(oldType.returnType(), ptypes);
+ return target.dropArguments(newType, pos, dropped);
+ }
--- jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-09-06 11:28:11.000000000 -0700
-+++ jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-04-20 12:39:18.000000000 -0700
@@ -788,6 +788,7 @@
* @throws IllegalArgumentException if the argument is not a
* proxy instance
@@ -46745,7 +32741,7 @@
private static native Class defineClass0(ClassLoader loader, String name,
--- jdk/src/share/classes/java/net/Inet6Address.java 2013-09-06 11:28:11.000000000 -0700
-+++ jdk/src/share/classes/java/net/Inet6Address.java 2013-12-01 11:14:29.000000000 -0800
++++ jdk/src/share/classes/java/net/Inet6Address.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,8 @@
package java.net;
@@ -47462,7 +33458,7 @@
- }
}
--- jdk/src/share/classes/java/net/InetAddress.java 2013-09-06 11:28:11.000000000 -0700
-+++ jdk/src/share/classes/java/net/InetAddress.java 2013-12-01 11:14:29.000000000 -0800
++++ jdk/src/share/classes/java/net/InetAddress.java 2014-04-20 12:39:19.000000000 -0700
@@ -213,6 +213,13 @@
this.family = family;
}
@@ -47486,7 +33482,7 @@
}
--- jdk/src/share/classes/java/net/Socket.java 2013-09-06 11:28:11.000000000 -0700
-+++ jdk/src/share/classes/java/net/Socket.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/net/Socket.java 2014-04-20 12:39:19.000000000 -0700
@@ -624,6 +624,10 @@
InetAddress addr = epoint.getAddress();
int port = epoint.getPort();
@@ -47499,7 +33495,7 @@
bound = true;
}
--- jdk/src/share/classes/java/net/SocketPermission.java 2013-09-06 11:28:11.000000000 -0700
-+++ jdk/src/share/classes/java/net/SocketPermission.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/net/SocketPermission.java 2014-04-20 12:39:19.000000000 -0700
@@ -34,6 +34,9 @@
import java.net.InetAddress;
import java.security.Permission;
@@ -47658,8 +33654,19 @@
/*
public String toString()
{
+--- jdk/src/share/classes/java/util/ServiceLoader.java 2013-09-06 11:28:15.000000000 -0700
++++ jdk/src/share/classes/java/util/ServiceLoader.java 2014-04-20 12:39:18.000000000 -0700
+@@ -375,7 +375,7 @@
+ return p;
+ } catch (Throwable x) {
+ fail(service,
+- "Provider " + cn + " could not be instantiated: " + x,
++ "Provider " + cn + " could not be instantiated",
+ x);
+ }
+ throw new Error(); // This cannot happen
--- jdk/src/share/classes/java/util/TimeZone.java 2013-09-06 11:28:15.000000000 -0700
-+++ jdk/src/share/classes/java/util/TimeZone.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/java/util/TimeZone.java 2014-04-20 12:39:18.000000000 -0700
@@ -165,6 +165,11 @@
// Proclaim serialization compatibility with JDK 1.1
static final long serialVersionUID = 3581463369166924961L;
@@ -47781,7 +33788,7 @@
return zi;
}
--- jdk/src/share/classes/java/util/jar/JarVerifier.java 2013-09-06 11:28:16.000000000 -0700
-+++ jdk/src/share/classes/java/util/jar/JarVerifier.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/util/jar/JarVerifier.java 2014-04-20 12:39:18.000000000 -0700
@@ -169,7 +169,9 @@
name = name.substring(1);
@@ -47793,8 +33800,42 @@
mev.setEntry(name, je);
return;
}
+@@ -675,6 +677,8 @@
+ } else {
+ matchUnsigned = true;
+ }
++ } else {
++ matchUnsigned = true;
+ }
+ }
+
+@@ -777,23 +781,7 @@
+
+ // true if file is part of the signature mechanism itself
+ static boolean isSigningRelated(String name) {
+- name = name.toUpperCase(Locale.ENGLISH);
+- if (!name.startsWith("META-INF/")) {
+- return false;
+- }
+- name = name.substring(9);
+- if (name.indexOf('/') != -1) {
+- return false;
+- }
+- if (name.endsWith(".DSA")
+- || name.endsWith(".RSA")
+- || name.endsWith(".SF")
+- || name.endsWith(".EC")
+- || name.startsWith("SIG-")
+- || name.equals("MANIFEST.MF")) {
+- return true;
+- }
+- return false;
++ return SignatureFileVerifier.isSigningRelated(name);
+ }
+
+ private Enumeration<String> unsignedEntryNames(JarFile jar) {
--- jdk/src/share/classes/java/util/logging/LogManager.java 2013-09-06 11:28:16.000000000 -0700
-+++ jdk/src/share/classes/java/util/logging/LogManager.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/java/util/logging/LogManager.java 2014-04-20 12:39:18.000000000 -0700
@@ -257,6 +257,11 @@
* retrieved by calling Logmanager.getLogManager.
*/
@@ -47827,8 +33868,255 @@
/**
* Return the global LogManager object.
*/
+@@ -345,6 +363,9 @@
+ changes.removePropertyChangeListener(l);
+ }
+
++ // LoggerContext maps from AppContext
++ private static WeakHashMap<Object, LoggerContext> contextsMap = null;
++
+ // Returns the LoggerContext for the user code (i.e. application or AppContext).
+ // Loggers are isolated from each AppContext.
+ private LoggerContext getUserContext() {
+@@ -353,33 +374,28 @@
+ SecurityManager sm = System.getSecurityManager();
+ JavaAWTAccess javaAwtAccess = SharedSecrets.getJavaAWTAccess();
+ if (sm != null && javaAwtAccess != null) {
++ // for each applet, it has its own LoggerContext isolated from others
+ synchronized (javaAwtAccess) {
+- // AppContext.getAppContext() returns the system AppContext if called
+- // from a system thread but Logger.getLogger might be called from
+- // an applet code. Instead, find the AppContext of the applet code
+- // from the execution stack.
+- Object ecx = javaAwtAccess.getExecutionContext();
+- if (ecx == null) {
+- // fall back to thread group seach of AppContext
+- ecx = javaAwtAccess.getContext();
+- }
++ // find the AppContext of the applet code
++ // will be null if we are in the main app context.
++ final Object ecx = javaAwtAccess.getAppletContext();
+ if (ecx != null) {
+- context = (LoggerContext)javaAwtAccess.get(ecx, LoggerContext.class);
++ if (contextsMap == null) {
++ contextsMap = new WeakHashMap<>();
++ }
++ context = contextsMap.get(ecx);
+ if (context == null) {
+- if (javaAwtAccess.isMainAppContext()) {
+- context = userContext;
+- } else {
+- // Create a new LoggerContext for the applet.
+- // The new logger context has its requiresDefaultLoggers
+- // flag set to true - so that these loggers will be
+- // lazily added when the context is firt accessed.
+- context = new LoggerContext(true);
+- }
+- javaAwtAccess.put(ecx, LoggerContext.class, context);
++ // Create a new LoggerContext for the applet.
++ // The new logger context has its requiresDefaultLoggers
++ // flag set to true - so that these loggers will be
++ // lazily added when the context is firt accessed.
++ context = new LoggerContext(true);
++ contextsMap.put(ecx, context);
+ }
+ }
+ }
+ }
++ // for standalone app, return userContext
+ return context != null ? context : userContext;
+ }
+
+@@ -406,7 +422,7 @@
+ Logger result = getLogger(name);
+ if (result == null) {
+ // only allocate the new logger once
+- Logger newLogger = new Logger(name, resourceBundleName, caller);
++ Logger newLogger = new Logger(name, resourceBundleName, caller, false);
+ do {
+ if (addLogger(newLogger)) {
+ // We successfully added the new Logger that we
+@@ -453,12 +469,12 @@
+ } while (logger == null);
+
+ // LogManager will set the sysLogger's handlers via LogManager.addLogger method.
+- if (logger != sysLogger && sysLogger.getHandlers().length == 0) {
++ if (logger != sysLogger && sysLogger.accessCheckedHandlers().length == 0) {
+ // if logger already exists but handlers not set
+ final Logger l = logger;
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+- for (Handler hdl : l.getHandlers()) {
++ for (Handler hdl : l.accessCheckedHandlers()) {
+ sysLogger.addHandler(hdl);
+ }
+ return null;
+@@ -742,7 +758,7 @@
+ Logger result = findLogger(name);
+ if (result == null) {
+ // only allocate the new system logger once
+- Logger newLogger = new Logger(name, resourceBundleName);
++ Logger newLogger = new Logger(name, resourceBundleName, null, true);
+ do {
+ if (addLocalLogger(newLogger)) {
+ // We successfully added the new Logger that we
+@@ -1407,31 +1423,35 @@
+ // We use a subclass of Logger for the root logger, so
+ // that we only instantiate the global handlers when they
+ // are first needed.
+- private class RootLogger extends Logger {
++ private final class RootLogger extends Logger {
+ private RootLogger() {
+- super("", null);
++ super("", null, null, true);
+ setLevel(defaultLevel);
+ }
+
++ @Override
+ public void log(LogRecord record) {
+ // Make sure that the global handlers have been instantiated.
+ initializeGlobalHandlers();
+ super.log(record);
+ }
+
++ @Override
+ public void addHandler(Handler h) {
+ initializeGlobalHandlers();
+ super.addHandler(h);
+ }
+
++ @Override
+ public void removeHandler(Handler h) {
+ initializeGlobalHandlers();
+ super.removeHandler(h);
+ }
+
+- public Handler[] getHandlers() {
++ @Override
++ Handler[] accessCheckedHandlers() {
+ initializeGlobalHandlers();
+- return super.getHandlers();
++ return super.accessCheckedHandlers();
+ }
+ }
+
+--- jdk/src/share/classes/java/util/logging/Logger.java 2013-09-06 11:28:16.000000000 -0700
++++ jdk/src/share/classes/java/util/logging/Logger.java 2014-04-20 12:39:18.000000000 -0700
+@@ -178,7 +178,7 @@
+ private String name;
+ private final CopyOnWriteArrayList<Handler> handlers =
+ new CopyOnWriteArrayList<>();
+- private String resourceBundleName;
++ private volatile String resourceBundleName;
+ private volatile boolean useParentHandlers = true;
+ private volatile Filter filter;
+ private boolean anonymous;
+@@ -189,7 +189,7 @@
+
+ // The fields relating to parent-child relationships and levels
+ // are managed under a separate lock, the treeLock.
+- private static Object treeLock = new Object();
++ private static final Object treeLock = new Object();
+ // We keep weak references from parents to children, but strong
+ // references from children to parents.
+ private volatile Logger parent; // our nearest parent.
+@@ -197,6 +197,7 @@
+ private volatile Level levelObject;
+ private volatile int levelValue; // current effective level value
+ private WeakReference<ClassLoader> callersClassLoaderRef;
++ private final boolean isSystemLogger;
+
+ /**
+ * GLOBAL_LOGGER_NAME is a name for the global logger.
+@@ -257,11 +258,12 @@
+ * no corresponding resource can be found.
+ */
+ protected Logger(String name, String resourceBundleName) {
+- this(name, resourceBundleName, null);
++ this(name, resourceBundleName, null, false);
+ }
+
+- Logger(String name, String resourceBundleName, Class<?> caller) {
++ Logger(String name, String resourceBundleName, Class<?> caller, boolean isSystemLogger) {
+ this.manager = LogManager.getLogManager();
++ this.isSystemLogger = isSystemLogger;
+ setupResourceInfo(resourceBundleName, caller);
+ this.name = name;
+ levelValue = Level.INFO.intValue();
+@@ -288,6 +290,7 @@
+ private Logger(String name) {
+ // The manager field is not initialized here.
+ this.name = name;
++ this.isSystemLogger = true;
+ levelValue = Level.INFO.intValue();
+ }
+
+@@ -528,7 +531,7 @@
+ // cleanup some Loggers that have been GC'ed
+ manager.drainLoggerRefQueueBounded();
+ Logger result = new Logger(null, resourceBundleName,
+- Reflection.getCallerClass());
++ Reflection.getCallerClass(), false);
+ result.anonymous = true;
+ Logger root = manager.getLogger("");
+ result.doSetParent(root);
+@@ -606,15 +609,22 @@
+
+ Logger logger = this;
+ while (logger != null) {
+- for (Handler handler : logger.getHandlers()) {
++ final Handler[] loggerHandlers = isSystemLogger
++ ? logger.accessCheckedHandlers()
++ : logger.getHandlers();
++ for (Handler handler : loggerHandlers) {
+ handler.publish(record);
+ }
+
+- if (!logger.getUseParentHandlers()) {
++ final boolean useParentHdls = isSystemLogger
++ ? logger.useParentHandlers
++ : logger.getUseParentHandlers();
++
++ if (!useParentHdls) {
+ break;
+ }
+
+- logger = logger.getParent();
++ logger = isSystemLogger ? logger.parent : logger.getParent();
+ }
+ }
+
+@@ -1337,6 +1347,12 @@
+ * @return an array of all registered Handlers
+ */
+ public Handler[] getHandlers() {
++ return accessCheckedHandlers();
++ }
++
++ // This method should ideally be marked final - but unfortunately
++ // it needs to be overridden by LogManager.RootLogger
++ Handler[] accessCheckedHandlers() {
+ return handlers.toArray(emptyHandlers);
+ }
+
+@@ -1669,11 +1685,13 @@
+ private String getEffectiveResourceBundleName() {
+ Logger target = this;
+ while (target != null) {
+- String rbn = target.getResourceBundleName();
++ final String rbn = isSystemLogger
++ ? target.resourceBundleName
++ : target.getResourceBundleName();
+ if (rbn != null) {
+ return rbn;
+ }
+- target = target.getParent();
++ target = isSystemLogger ? target.parent : target.getParent();
+ }
+ return null;
+ }
--- jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2013-09-06 11:28:18.000000000 -0700
-+++ jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2014-04-20 12:39:19.000000000 -0700
@@ -25,6 +25,9 @@
package javax.management;
@@ -47875,7 +34163,7 @@
+ }
}
--- jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2014-04-20 12:39:19.000000000 -0700
@@ -25,6 +25,9 @@
package javax.management;
@@ -47920,7 +34208,7 @@
+ }
}
--- jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2013-09-06 11:28:18.000000000 -0700
-+++ jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,9 @@
package javax.management;
@@ -47970,7 +34258,7 @@
}
}
--- jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-09-06 11:28:18.000000000 -0700
-+++ jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2014-04-20 12:39:19.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -48003,7 +34291,7 @@
\ No newline at end of file
+}
--- jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2013-09-06 11:28:19.000000000 -0700
-+++ jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,9 @@
package javax.management.remote;
@@ -48047,7 +34335,7 @@
+ }
}
--- jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2013-09-06 11:28:19.000000000 -0700
-+++ jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2014-04-20 12:39:19.000000000 -0700
@@ -29,6 +29,9 @@
import com.sun.jmx.remote.util.ClassLogger;
@@ -48208,7 +34496,7 @@
/**
* Cached result of {@link #toString()}.
--- jdk/src/share/classes/javax/management/remote/NotificationResult.java 2013-09-06 11:28:19.000000000 -0700
-+++ jdk/src/share/classes/javax/management/remote/NotificationResult.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/remote/NotificationResult.java 2014-04-20 12:39:19.000000000 -0700
@@ -25,6 +25,9 @@
package javax.management.remote;
@@ -48283,7 +34571,7 @@
+ }
}
--- jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2013-09-06 11:28:19.000000000 -0700
-+++ jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,9 @@
package javax.management.remote;
@@ -48348,7 +34636,7 @@
+ }
}
--- jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2013-09-06 11:28:19.000000000 -0700
-+++ jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2014-04-20 12:39:19.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -48420,7 +34708,7 @@
Object credentials,
boolean checkStub)
--- jdk/src/share/classes/javax/print/SimpleDoc.java 2013-09-06 11:28:20.000000000 -0700
-+++ jdk/src/share/classes/javax/print/SimpleDoc.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/print/SimpleDoc.java 2014-04-20 12:39:19.000000000 -0700
@@ -91,7 +91,10 @@
Class repClass = null;
@@ -48433,8 +34721,64 @@
} catch (Throwable e) {
throw new IllegalArgumentException("unknown representation class");
}
+--- jdk/src/share/classes/javax/script/ScriptEngineManager.java 2013-09-06 11:28:21.000000000 -0700
++++ jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-04-20 12:39:19.000000000 -0700
+@@ -85,15 +85,18 @@
+ nameAssociations = new HashMap<String, ScriptEngineFactory>();
+ extensionAssociations = new HashMap<String, ScriptEngineFactory>();
+ mimeTypeAssociations = new HashMap<String, ScriptEngineFactory>();
+- AccessController.doPrivileged(new PrivilegedAction<Object>() {
+- public Object run() {
+- initEngines(loader);
+- return null;
+- }
+- });
++ List<ScriptEngineFactory> facList = AccessController.doPrivileged(
++ new PrivilegedAction<List<ScriptEngineFactory>>() {
++ public List<ScriptEngineFactory> run() {
++ return initEngines(loader);
++ }
++ });
++ for (ScriptEngineFactory fac : facList) {
++ engineSpis.add(fac);
++ }
+ }
+
+- private void initEngines(final ClassLoader loader) {
++ private List<ScriptEngineFactory> initEngines(final ClassLoader loader) {
+ Iterator itr = null;
+ try {
+ if (loader != null) {
+@@ -110,14 +113,15 @@
+ // do not throw any exception here. user may want to
+ // manage his/her own factories using this manager
+ // by explicit registratation (by registerXXX) methods.
+- return;
++ return null;
+ }
+
++ final List<ScriptEngineFactory> facList = new ArrayList<>();
+ try {
+ while (itr.hasNext()) {
+ try {
+ ScriptEngineFactory fact = (ScriptEngineFactory) itr.next();
+- engineSpis.add(fact);
++ facList.add(fact);
+ } catch (ServiceConfigurationError err) {
+ System.err.println("ScriptEngineManager providers.next(): "
+ + err.getMessage());
+@@ -137,8 +141,8 @@
+ // do not throw any exception here. user may want to
+ // manage his/her own factories using this manager
+ // by explicit registratation (by registerXXX) methods.
+- return;
+ }
++ return facList;
+ }
+
+ /**
--- jdk/src/share/classes/javax/security/auth/Policy.java 2013-09-06 11:28:21.000000000 -0700
-+++ jdk/src/share/classes/javax/security/auth/Policy.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/security/auth/Policy.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,10 @@
package javax.security.auth;
@@ -48525,19 +34869,40 @@
throw new SecurityException
(sun.security.util.ResourcesMgr.getString
--- jdk/src/share/classes/javax/security/auth/Subject.java 2013-09-06 11:28:21.000000000 -0700
-+++ jdk/src/share/classes/javax/security/auth/Subject.java 2014-01-18 12:16:24.000000000 -0800
-@@ -946,6 +946,10 @@
-
- s.defaultReadObject();
++++ jdk/src/share/classes/javax/security/auth/Subject.java 2014-04-20 12:39:19.000000000 -0700
+@@ -941,10 +941,30 @@
+ /**
+ * Reads this object from a stream (i.e., deserializes it)
+ */
++ @SuppressWarnings("unchecked")
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
-+ // Rewrap the principals into a SecureSet
-+ principals = Collections.synchronizedSet(new SecureSet<Principal>
-+ (this, PRINCIPAL_SET, principals));
+- s.defaultReadObject();
++ ObjectInputStream.GetField gf = s.readFields();
++
++ readOnly = gf.get("readOnly", false);
++
++ Set<Principal> inputPrincs = (Set<Principal>)gf.get("principals", null);
+
++ // Rewrap the principals into a SecureSet
++ if (inputPrincs == null) {
++ throw new NullPointerException
++ (ResourcesMgr.getString("invalid.null.input.s."));
++ }
++ try {
++ principals = Collections.synchronizedSet(new SecureSet<Principal>
++ (this, PRINCIPAL_SET, inputPrincs));
++ } catch (NullPointerException npe) {
++ // Sometimes people deserialize the principals set only.
++ // Subject is not accessible, so just don't fail.
++ principals = Collections.synchronizedSet
++ (new SecureSet<Principal>(this, PRINCIPAL_SET));
++ }
+
// The Credential <code>Set</code> is not serialized, but we do not
// want the default deserialization routine to set it to null.
- this.pubCredentials = Collections.synchronizedSet
-@@ -1296,8 +1300,14 @@
+@@ -1296,8 +1316,14 @@
{
ObjectInputStream.GetField fields = ois.readFields();
subject = (Subject) fields.get("this$0", null);
@@ -48554,7 +34919,7 @@
}
--- jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2013-09-06 11:28:21.000000000 -0700
-+++ jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2014-04-20 12:39:19.000000000 -0700
@@ -26,6 +26,7 @@
package javax.security.auth.kerberos;
@@ -48585,7 +34950,7 @@
/**
--- jdk/src/share/classes/javax/security/auth/login/Configuration.java 2013-09-06 11:28:21.000000000 -0700
-+++ jdk/src/share/classes/javax/security/auth/login/Configuration.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/security/auth/login/Configuration.java 2014-04-20 12:39:19.000000000 -0700
@@ -27,9 +27,6 @@
import javax.security.auth.AuthPermission;
@@ -48663,7 +35028,7 @@
Exception ee = e.getException();
if (ee instanceof InstantiationException) {
--- jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2013-09-06 11:28:21.000000000 -0700
-+++ jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2014-04-20 12:39:19.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -48906,8 +35271,104 @@
boolean status = ((Boolean)methods[mIndex].invoke
(moduleStack[i].module, args)).booleanValue();
+--- jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java 2013-09-06 11:28:22.000000000 -0700
++++ jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -30,6 +30,7 @@
+ import java.sql.SQLException;
+ import java.util.ServiceConfigurationError;
+ import java.util.ServiceLoader;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * A factory API that enables applications to obtain a
+@@ -127,15 +128,11 @@
+ factoryClassName = getSystemProperty(ROWSET_FACTORY_NAME);
+ if (factoryClassName != null) {
+ trace("Found system property, value=" + factoryClassName);
+- factory = (RowSetFactory) getFactoryClass(factoryClassName, null, true).newInstance();
++ factory = (RowSetFactory) ReflectUtil.newInstance(getFactoryClass(factoryClassName, null, true));
+ }
+- } catch (ClassNotFoundException e) {
+- throw new SQLException(
+- "RowSetFactory: " + factoryClassName + " not found", e);
+- } catch (Exception e) {
+- throw new SQLException(
+- "RowSetFactory: " + factoryClassName + " could not be instantiated: " + e,
+- e);
++ } catch (Exception e) {
++ throw new SQLException( "RowSetFactory: " + factoryClassName +
++ " could not be instantiated: ", e);
+ }
+
+ // Check to see if we found the RowSetFactory via a System property
+@@ -180,6 +177,16 @@
+ throws SQLException {
+
+ trace("***In newInstance()");
++
++ if(factoryClassName == null) {
++ throw new SQLException("Error: factoryClassName cannot be null");
++ }
++ try {
++ ReflectUtil.checkPackageAccess(factoryClassName);
++ } catch (java.security.AccessControlException e) {
++ throw new SQLException("Access Exception",e);
++ }
++
+ try {
+ Class providerClass = getFactoryClass(factoryClassName, cl, false);
+ RowSetFactory instance = (RowSetFactory) providerClass.newInstance();
+@@ -292,6 +299,7 @@
+ });
+ } catch (SecurityException se) {
+ if (debug) {
++ trace("error getting " + propName + ": "+ se);
+ se.printStackTrace();
+ }
+ }
+--- jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java 2013-09-06 11:28:22.000000000 -0700
++++ jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -30,6 +30,7 @@
+ import java.io.*;
+ import java.math.*;
+ import java.util.Map;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * An input stream used for custom mapping user-defined types (UDTs).
+@@ -606,13 +607,9 @@
+ // create new instance of the class
+ SQLData obj = null;
+ try {
+- obj = (SQLData)c.newInstance();
+- } catch (java.lang.InstantiationException ex) {
+- throw new SQLException("Unable to instantiate: " +
+- ex.getMessage());
+- } catch (java.lang.IllegalAccessException ex) {
+- throw new SQLException("Unable to instantiate: " +
+- ex.getMessage());
++ obj = (SQLData)ReflectUtil.newInstance(c);
++ } catch (Exception ex) {
++ throw new SQLException("Unable to Instantiate: ", ex);
+ }
+ // get the attributes from the struct
+ Object attribs[] = s.getAttributes(map);
--- jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2013-09-06 11:28:22.000000000 -0700
-+++ jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-04-20 12:39:19.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -48915,16 +35376,30 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -35,6 +35,8 @@
+@@ -35,8 +35,13 @@
import java.io.InputStream;
import java.io.IOException;
import java.io.FileNotFoundException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
import javax.naming.*;
++import sun.reflect.misc.ReflectUtil;
-@@ -362,7 +364,16 @@
+ /**
+ * The Service Provider Interface (SPI) mechanism that generates <code>SyncProvider</code>
+@@ -341,7 +346,7 @@
+ // Local implementation class names and keys from Properties
+ // file, translate names into Class objects using Class.forName
+ // and store mappings
+- Properties properties = new Properties();
++ final Properties properties = new Properties();
+
+ if (implementations == null) {
+ implementations = new Hashtable();
+@@ -362,7 +367,17 @@
/*
* Dependent on application
*/
@@ -48937,12 +35412,55 @@
+ }
+ });
+ } catch (Exception ex) {
++ System.out.println("errorget rowset.properties: " + ex);
+ strRowsetProperties = null;
+ }
if (strRowsetProperties != null) {
// Load user's implementation of SyncProvider
// here. -Drowset.properties=/abc/def/pqr.txt
-@@ -407,7 +418,16 @@
+@@ -380,16 +395,33 @@
+ strFileSep + "rowset" + strFileSep +
+ "rowset.properties";
+
+- ClassLoader cl = Thread.currentThread().getContextClassLoader();
++ final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
+- try (InputStream stream =
+- (cl == null) ? ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES)
+- : cl.getResourceAsStream(ROWSET_PROPERTIES)) {
+- if (stream == null) {
+- throw new SyncFactoryException(
+- "Resource " + ROWSET_PROPERTIES + " not found");
++ try {
++ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
++ @Override
++ public Void run() throws SyncFactoryException, IOException, FileNotFoundException {
++ try (InputStream stream = (cl == null) ?
++ ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES)
++ : cl.getResourceAsStream(ROWSET_PROPERTIES)) {
++ if (stream == null) {
++ throw new SyncFactoryException("Resource " + ROWSET_PROPERTIES + " not found");
++ }
++ properties.load(stream);
++ }
++ return null;
++ }
++
++ });
++ } catch (PrivilegedActionException ex) {
++ Throwable e = ex.getException();
++ if (e instanceof SyncFactoryException) {
++ throw (SyncFactoryException) e;
++ } else {
++ SyncFactoryException sfe = new SyncFactoryException();
++ sfe.initCause(ex.getException());
++ throw sfe;
+ }
+- properties.load(stream);
+ }
+
+ parseProperties(properties);
+@@ -407,7 +439,16 @@
* load additional properties from -D command line
*/
properties.clear();
@@ -48960,8 +35478,31 @@
if (providerImpls != null) {
int i = 0;
+@@ -540,6 +581,13 @@
+ return new com.sun.rowset.providers.RIOptimisticProvider();
+ }
+
++ try {
++ ReflectUtil.checkPackageAccess(providerID);
++ } catch (java.security.AccessControlException e) {
++ SyncFactoryException sfe = new SyncFactoryException();
++ sfe.initCause(e);
++ throw sfe;
++ }
+ // Attempt to invoke classname from registered SyncProvider list
+ Class c = null;
+ try {
+@@ -548,7 +596,7 @@
+ /**
+ * The SyncProvider implementation of the user will be in
+ * the classpath. We need to find the ClassLoader which loads
+- * this SyncFactory and try to laod the SyncProvider class from
++ * this SyncFactory and try to load the SyncProvider class from
+ * there.
+ **/
+ c = Class.forName(providerID, true, cl);
--- jdk/src/share/classes/javax/swing/JTable.java 2013-09-06 11:28:23.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/JTable.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/classes/javax/swing/JTable.java 2014-04-20 12:39:19.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -49010,7 +35551,7 @@
}
catch (Exception e) {
--- jdk/src/share/classes/javax/swing/SwingUtilities.java 2013-09-06 11:28:23.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/SwingUtilities.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/swing/SwingUtilities.java 2014-04-20 12:39:19.000000000 -0700
@@ -24,6 +24,7 @@
*/
package javax.swing;
@@ -49038,7 +35579,7 @@
getContextClassLoader());
}
--- jdk/src/share/classes/javax/swing/UIDefaults.java 2013-09-06 11:28:24.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/UIDefaults.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/classes/javax/swing/UIDefaults.java 2014-04-20 12:39:19.000000000 -0700
@@ -53,6 +53,7 @@
import sun.reflect.misc.MethodUtil;
@@ -49080,7 +35621,7 @@
* Coerce the array of class types provided into one which
* looks the way the Reflection APIs expect. This is done
--- jdk/src/share/classes/javax/swing/event/EventListenerList.java 2013-09-06 11:28:24.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/event/EventListenerList.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/classes/javax/swing/event/EventListenerList.java 2014-04-20 12:39:19.000000000 -0700
@@ -27,6 +27,7 @@
import java.io.*;
import java.util.*;
@@ -49101,7 +35642,7 @@
}
--- jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2013-09-06 11:28:27.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2014-04-20 12:39:19.000000000 -0700
@@ -24,7 +24,8 @@
*/
package javax.swing.text;
@@ -49132,7 +35673,7 @@
} catch (Throwable ex) {
throw new ParseException("Error creating instance", 0);
--- jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2013-09-06 11:28:27.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2014-04-20 12:39:19.000000000 -0700
@@ -27,6 +27,8 @@
import java.lang.reflect.*;
import java.text.*;
@@ -49157,7 +35698,7 @@
}
} catch (Throwable ex) { }
--- jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2013-09-06 11:28:27.000000000 -0700
-+++ jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2014-04-20 12:39:19.000000000 -0700
@@ -31,6 +31,9 @@
import java.beans.*;
import java.lang.reflect.*;
@@ -49214,8 +35755,208 @@
} catch (Exception ex) {
System.err.println("Invocation failed");
// invocation code
+--- jdk/src/share/classes/sun/awt/AWTAccessor.java 2013-09-06 11:28:29.000000000 -0700
++++ jdk/src/share/classes/sun/awt/AWTAccessor.java 2014-04-20 12:39:19.000000000 -0700
+@@ -29,6 +29,7 @@
+ import java.awt.KeyboardFocusManager;
+ import java.awt.DefaultKeyboardFocusManager;
+ import java.awt.event.InputEvent;
++import java.awt.event.InvocationEvent;
+ import java.awt.event.KeyEvent;
+ import java.awt.geom.Point2D;
+
+@@ -690,6 +691,25 @@
+ }
+
+ /*
++ * An accessor object for the InvocationEvent class
++ */
++ public interface InvocationEventAccessor {
++ /**
++ * Disposes the InvocationEvent
++ */
++ void dispose(InvocationEvent event);
++
++ /**
++ * Creates an InvocationEvent with a completion listener -
++ * a Runnable whose run() method will be called immediately after
++ * the event is dispatched or disposed
++ */
++ InvocationEvent createEvent(Object source, Runnable runnable, Runnable listener,
++ boolean catchThrowables);
++ }
++
++
++ /*
+ * Accessor instances are initialized in the static initializers of
+ * corresponding AWT classes by using setters defined below.
+ */
+@@ -716,6 +736,7 @@
+ private static TrayIconAccessor trayIconAccessor;
+ private static DefaultKeyboardFocusManagerAccessor defaultKeyboardFocusManagerAccessor;
+ private static SequencedEventAccessor sequencedEventAccessor;
++ private static InvocationEventAccessor invocationEventAccessor;
+
+ /*
+ * Set an accessor object for the java.awt.Component class.
+@@ -1110,4 +1131,18 @@
+ // (so not a single instance of the event has been created).
+ return sequencedEventAccessor;
+ }
++
++ /*
++ * Get the accessor object for the java.awt.event.InvocationEvent class.
++ */
++ public static void setInvocationEventAccessor(InvocationEventAccessor invocationEventAccessor) {
++ AWTAccessor.invocationEventAccessor = invocationEventAccessor;
++ }
++
++ /*
++ * Set the accessor object for the java.awt.event.InvocationEvent class.
++ */
++ public static InvocationEventAccessor getInvocationEventAccessor() {
++ return invocationEventAccessor;
++ }
+ }
+--- jdk/src/share/classes/sun/awt/AWTAutoShutdown.java 2013-09-06 11:28:29.000000000 -0700
++++ jdk/src/share/classes/sun/awt/AWTAutoShutdown.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,10 +26,13 @@
+ package sun.awt;
+
+ import java.awt.AWTEvent;
+-import java.util.Collections;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.HashSet;
+ import java.util.IdentityHashMap;
+ import java.util.Map;
++
++import sun.misc.ThreadGroupUtils;
+ import sun.util.logging.PlatformLogger;
+
+ /**
+@@ -212,7 +215,13 @@
+ synchronized (activationLock) {
+ synchronized (mainLock) {
+ if (!isReadyToShutdown() && blockerThread == null) {
+- activateBlockerThread();
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ activateBlockerThread();
++ return null;
++ }
++ });
+ } else {
+ mainLock.notifyAll();
+ timeoutPassed = false;
+@@ -326,9 +335,12 @@
+ /**
+ * Creates and starts a new blocker thread. Doesn't return until
+ * the new blocker thread starts.
++ *
++ * Must be called with {@link sun.security.util.SecurityConstants#MODIFY_THREADGROUP_PERMISSION}
+ */
+ private void activateBlockerThread() {
+- Thread thread = new Thread(this, "AWT-Shutdown");
++ Thread thread = new Thread(ThreadGroupUtils.getRootThreadGroup(), this, "AWT-Shutdown");
++ thread.setContextClassLoader(null);
+ thread.setDaemon(false);
+ blockerThread = thread;
+ thread.start();
+--- jdk/src/share/classes/sun/awt/AppContext.java 2013-09-06 11:28:29.000000000 -0700
++++ jdk/src/share/classes/sun/awt/AppContext.java 2014-04-20 12:39:19.000000000 -0700
+@@ -837,21 +837,68 @@
+ public boolean isMainAppContext() {
+ return (numAppContexts.get() == 1 && mainAppContext != null);
+ }
+- public Object getContext() {
+- return getAppContext();
+- }
+- public Object getExecutionContext() {
+- return getExecutionAppContext();
+- }
+- public Object get(Object context, Object key) {
+- return ((AppContext)context).get(key);
+- }
+- public void put(Object context, Object key, Object value) {
+- ((AppContext)context).put(key, value);
++
++ private boolean hasRootThreadGroup(final AppContext ecx) {
++ return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
++ @Override
++ public Boolean run() {
++ return ecx.threadGroup.getParent() == null;
++ }
++ });
+ }
+- public void remove(Object context, Object key) {
+- ((AppContext)context).remove(key);
++
++ /**
++ * Returns the AppContext used for applet logging isolation, or null if
++ * the default global context can be used.
++ * If there's no applet, or if the caller is a stand alone application,
++ * or running in the main app context, returns null.
++ * Otherwise, returns the AppContext of the calling applet.
++ * @return null if the global default context can be used,
++ * an AppContext otherwise.
++ **/
++ public Object getAppletContext() {
++ // There's no AppContext: return null.
++ // No need to call getAppContext() if numAppContext == 0:
++ // it means that no AppContext has been created yet, and
++ // we don't want to trigger the creation of a main app
++ // context since we don't need it.
++ if (numAppContexts.get() == 0) return null;
++
++ // Get the context from the security manager
++ AppContext ecx = getExecutionAppContext();
++
++ // Not sure we really need to re-check numAppContexts here.
++ // If all applets have gone away then we could have a
++ // numAppContexts coming back to 0. So we recheck
++ // it here because we don't want to trigger the
++ // creation of a main AppContext in that case.
++ // This is probably not 100% MT-safe but should reduce
++ // the window of opportunity in which that issue could
++ // happen.
++ if (numAppContexts.get() > 0) {
++ // Defaults to thread group caching.
++ // This is probably not required as we only really need
++ // isolation in a deployed applet environment, in which
++ // case ecx will not be null when we reach here
++ // However it helps emulate the deployed environment,
++ // in tests for instance.
++ ecx = ecx != null ? ecx : getAppContext();
++ }
++
++ // getAppletContext() may be called when initializing the main
++ // app context - in which case mainAppContext will still be
++ // null. To work around this issue we simply use
++ // AppContext.threadGroup.getParent() == null instead, since
++ // mainAppContext is the only AppContext which should have
++ // the root TG as its thread group.
++ // See: JDK-8023258
++ final boolean isMainAppContext = ecx == null
++ || mainAppContext == ecx
++ || mainAppContext == null && hasRootThreadGroup(ecx);
++
++ return isMainAppContext ? null : ecx;
+ }
++
+ });
+ }
+ }
--- jdk/src/share/classes/sun/awt/FontConfiguration.java 2013-09-06 11:28:30.000000000 -0700
-+++ jdk/src/share/classes/sun/awt/FontConfiguration.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/awt/FontConfiguration.java 2014-04-20 12:39:19.000000000 -0700
@@ -1146,7 +1146,7 @@
*/
HashMap<String, Boolean> existsMap;
@@ -49226,7 +35967,7 @@
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
--- jdk/src/share/classes/sun/awt/OSInfo.java 2013-09-06 11:28:30.000000000 -0700
-+++ jdk/src/share/classes/sun/awt/OSInfo.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/awt/OSInfo.java 2014-04-20 12:39:19.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
LINUX,
@@ -49246,8 +35987,156 @@
if (osName.contains("OS X")) {
return MACOSX;
}
+--- jdk/src/share/classes/sun/awt/SunToolkit.java 2013-09-06 11:28:30.000000000 -0700
++++ jdk/src/share/classes/sun/awt/SunToolkit.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -37,6 +37,7 @@
+ import java.awt.SystemTray;
+ import java.awt.event.InputEvent;
+ import java.net.URL;
++import java.security.PrivilegedAction;
+ import java.util.*;
+ import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.locks.Condition;
+--- jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2013-09-06 11:28:30.000000000 -0700
++++ jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2014-04-20 12:39:19.000000000 -0700
+@@ -87,7 +87,7 @@
+ HashMap cached_data = new HashMap(formats.length, 1.0f);
+
+ Map flavorsForFormats = DataTransferer.getInstance().
+- getFlavorsForFormats(formats, SunClipboard.flavorMap);
++ getFlavorsForFormats(formats, SunClipboard.getDefaultFlavorTable());
+ for (Iterator iter = flavorsForFormats.keySet().iterator();
+ iter.hasNext(); )
+ {
+--- jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java 2013-09-06 11:28:30.000000000 -0700
++++ jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java 2014-04-20 12:39:19.000000000 -0700
+@@ -64,9 +64,6 @@
+ public abstract class SunClipboard extends Clipboard
+ implements PropertyChangeListener {
+
+- public static final FlavorTable flavorMap =
+- (FlavorTable)SystemFlavorMap.getDefaultFlavorMap();
+-
+ private AppContext contentsContext = null;
+
+ private final Object CLIPBOARD_FLAVOR_LISTENER_KEY;
+@@ -172,7 +169,7 @@
+ long[] formats = getClipboardFormatsOpenClose();
+
+ return DataTransferer.getInstance().
+- getFlavorsForFormatsAsArray(formats, flavorMap);
++ getFlavorsForFormatsAsArray(formats, getDefaultFlavorTable());
+ }
+
+ /**
+@@ -218,7 +215,7 @@
+
+ long[] formats = getClipboardFormats();
+ Long lFormat = (Long)DataTransferer.getInstance().
+- getFlavorsForFormats(formats, flavorMap).get(flavor);
++ getFlavorsForFormats(formats, getDefaultFlavorTable()).get(flavor);
+
+ if (lFormat == null) {
+ throw new UnsupportedFlavorException(flavor);
+@@ -349,7 +346,7 @@
+ private static Set formatArrayAsDataFlavorSet(long[] formats) {
+ return (formats == null) ? null :
+ DataTransferer.getInstance().
+- getFlavorsForFormatsAsSet(formats, flavorMap);
++ getFlavorsForFormatsAsSet(formats, getDefaultFlavorTable());
+ }
+
+
+@@ -469,4 +466,7 @@
+ }
+ }
+
++ public static FlavorTable getDefaultFlavorTable() {
++ return (FlavorTable) SystemFlavorMap.getDefaultFlavorMap();
++ }
+ }
+--- jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-09-06 11:28:31.000000000 -0700
++++ jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -27,12 +27,15 @@
+
+ import java.io.File;
+ import java.io.OutputStream;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.concurrent.Semaphore;
+ import java.util.concurrent.TimeUnit;
+
+ import sun.awt.AppContext;
++import sun.misc.ThreadGroupUtils;
+
+ public class CreatedFontTracker {
+
+@@ -112,28 +115,25 @@
+ static void init() {
+ if (t == null) {
+ // Add a shutdown hook to remove the temp file.
+- java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction() {
+- public Object run() {
+- /* The thread must be a member of a thread group
+- * which will not get GCed before VM exit.
+- * Make its parent the top-level thread group.
+- */
+- ThreadGroup tg =
+- Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null;
+- tg = tgn, tgn = tg.getParent());
+- t = new Thread(tg, new Runnable() {
+- public void run() {
+- runHooks();
+- }
+- });
+- t.setContextClassLoader(null);
+- Runtime.getRuntime().addShutdownHook(t);
+- return null;
+- }
+- });
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ /* The thread must be a member of a thread group
++ * which will not get GCed before VM exit.
++ * Make its parent the top-level thread group.
++ */
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ t = new Thread(rootTG, new Runnable() {
++ @Override
++ public void run() {
++ runHooks();
++ }
++ });
++ t.setContextClassLoader(null);
++ Runtime.getRuntime().addShutdownHook(t);
++ return null;
++ }
++ });
+ }
+ }
+
--- jdk/src/share/classes/sun/font/FileFont.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/FileFont.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/src/share/classes/sun/font/FileFont.java 2014-04-20 12:39:19.000000000 -0700
@@ -170,7 +170,9 @@
}
}
@@ -49260,7 +36149,7 @@
}
--- jdk/src/share/classes/sun/font/FontUtilities.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/FontUtilities.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/font/FontUtilities.java 2014-04-20 12:39:19.000000000 -0700
@@ -48,6 +48,8 @@
public static boolean isLinux;
@@ -49283,7 +36172,7 @@
String t2kStr = System.getProperty("sun.java2d.font.scaler");
--- jdk/src/share/classes/sun/font/GlyphLayout.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/GlyphLayout.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/src/share/classes/sun/font/GlyphLayout.java 2014-04-20 12:39:19.000000000 -0700
@@ -468,9 +468,10 @@
_gvdata.grow();
}
@@ -49299,7 +36188,7 @@
}
--- jdk/src/share/classes/sun/font/StandardGlyphVector.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/StandardGlyphVector.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/src/share/classes/sun/font/StandardGlyphVector.java 2014-04-20 12:39:19.000000000 -0700
@@ -1740,8 +1740,9 @@
tx,
sgv.font.getStyle(),
@@ -49313,8 +36202,23 @@
return new GlyphStrike(sgv, strike, dx, dy);
}
--- jdk/src/share/classes/sun/font/SunFontManager.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/SunFontManager.java 2014-01-18 12:16:33.000000000 -0800
-@@ -417,7 +417,7 @@
++++ jdk/src/share/classes/sun/font/SunFontManager.java 2014-04-20 12:39:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -52,6 +52,7 @@
+ import sun.awt.AppContext;
+ import sun.awt.FontConfiguration;
+ import sun.awt.SunToolkit;
++import sun.misc.ThreadGroupUtils;
+ import sun.java2d.FontSupport;
+ import sun.util.logging.PlatformLogger;
+
+@@ -417,7 +418,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
*/
@@ -49323,8 +36227,47 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
+@@ -2521,24 +2522,20 @@
+ });
+ }
+ };
+- java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction() {
+- public Object run() {
+- /* The thread must be a member of a thread group
+- * which will not get GCed before VM exit.
+- * Make its parent the top-level thread group.
+- */
+- ThreadGroup tg =
+- Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null;
+- tg = tgn, tgn = tg.getParent());
+- fileCloser = new Thread(tg, fileCloserRunnable);
+- fileCloser.setContextClassLoader(null);
+- Runtime.getRuntime().addShutdownHook(fileCloser);
+- return null;
+- }
+- });
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ /* The thread must be a member of a thread group
++ * which will not get GCed before VM exit.
++ * Make its parent the top-level thread group.
++ */
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ fileCloser = new Thread(rootTG, fileCloserRunnable);
++ fileCloser.setContextClassLoader(null);
++ Runtime.getRuntime().addShutdownHook(fileCloser);
++ return null;
++ }
++ });
+ }
+ }
+ }
--- jdk/src/share/classes/sun/font/TrueTypeFont.java 2013-09-06 11:28:31.000000000 -0700
-+++ jdk/src/share/classes/sun/font/TrueTypeFont.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/src/share/classes/sun/font/TrueTypeFont.java 2014-04-20 12:39:19.000000000 -0700
@@ -1037,6 +1037,9 @@
if (head_Table != null && head_Table.capacity() >= 18) {
ShortBuffer sb = head_Table.asShortBuffer();
@@ -49336,7 +36279,67 @@
ByteBuffer os2_Table = getTableBuffer(os_2Tag);
--- jdk/src/share/classes/sun/java2d/Disposer.java 2013-09-06 11:28:34.000000000 -0700
-+++ jdk/src/share/classes/sun/java2d/Disposer.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/src/share/classes/sun/java2d/Disposer.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,10 +25,14 @@
+
+ package sun.java2d;
+
++import sun.misc.ThreadGroupUtils;
++
+ import java.lang.ref.Reference;
+ import java.lang.ref.ReferenceQueue;
+ import java.lang.ref.PhantomReference;
+ import java.lang.ref.WeakReference;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.Hashtable;
+
+@@ -71,26 +75,22 @@
+ }
+ }
+ disposerInstance = new Disposer();
+- java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction() {
+- public Object run() {
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
+ /* The thread must be a member of a thread group
+ * which will not get GCed before VM exit.
+ * Make its parent the top-level thread group.
+ */
+- ThreadGroup tg = Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null;
+- tg = tgn, tgn = tg.getParent());
+- Thread t =
+- new Thread(tg, disposerInstance, "Java2D Disposer");
+- t.setContextClassLoader(null);
+- t.setDaemon(true);
+- t.setPriority(Thread.MAX_PRIORITY);
+- t.start();
+- return null;
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ Thread t = new Thread(rootTG, disposerInstance, "Java2D Disposer");
++ t.setContextClassLoader(null);
++ t.setDaemon(true);
++ t.setPriority(Thread.MAX_PRIORITY);
++ t.start();
++ return null;
++ }
+ }
+- }
+ );
+ }
+
@@ -150,8 +150,7 @@
rec = null;
clearDeferredRecords();
@@ -49365,8 +36368,40 @@
} finally {
pollingQueue = false;
}
+--- jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java 2013-09-06 11:28:34.000000000 -0700
++++ jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,6 +25,7 @@
+
+ package sun.java2d.opengl;
+
++import sun.misc.ThreadGroupUtils;
+ import sun.java2d.pipe.RenderBuffer;
+ import sun.java2d.pipe.RenderQueue;
+ import static sun.java2d.pipe.BufferedOpCodes.*;
+@@ -48,12 +49,9 @@
+ * which will not get GCed before VM exit.
+ */
+ flusher = AccessController.doPrivileged(new PrivilegedAction<QueueFlusher>() {
++ @Override
+ public QueueFlusher run() {
+- ThreadGroup rootThreadGroup = Thread.currentThread().getThreadGroup();
+- while (rootThreadGroup.getParent() != null) {
+- rootThreadGroup = rootThreadGroup.getParent();
+- }
+- return new QueueFlusher(rootThreadGroup);
++ return new QueueFlusher(ThreadGroupUtils.getRootThreadGroup());
+ }
+ });
+ }
--- jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2013-09-06 11:28:35.000000000 -0700
-+++ jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2014-04-20 12:39:19.000000000 -0700
@@ -34,7 +34,7 @@
java.launcher.ergo.message2 =\ car vous ex\u00E9cutez une machine de classe de serveur.\n
@@ -49377,7 +36412,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\ -Xmixed ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n -Xint ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n d\u00E9finition du chemin de recherche pour les ressources et classes bootstrap\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n ajout \u00E0 la fin du chemin de classe bootstrap\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n ajout au d\u00E9but du chemin de classe bootstrap\n -Xdiag affichage de messages de diagnostic suppl\u00E9mentaires\n -Xnoclassgc d\u00E9sactivation de l''op\u00E9ration de ramasse-miette (garbage collection) de la classe\n -Xincgc activation de l''op\u00E9ration de ramasse-miette (garbage collection) incr\u00E9mentielle\n -Xloggc:<file> journalisation du statut de l''op\u00E9ration de ramasse-miette (garbage collection) dans un fichier avec horodatages\n -Xbatch d\u00E9sactivation de la compilation en arri\u00E8re-plan\n -Xms<size> d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n -Xmx<size> d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n -Xss<size> d\u00E9finition de la taille de pile de thread Java\n -Xprof sortie des donn\u00E9es de profilage de l''unit\u00E9 centrale\n -Xfuture activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n -Xrs r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n -Xcheck:jni ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n -Xshare:off aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n -Xshare:auto utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n -Xshare:on utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration\n -XshowSettings affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:all\n affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n -XshowSettings:properties\n affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n -XshowSettings:locale\n affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n\nLes options -X ne sont pas des options standard et peuvent faire l''objet de modifications sans pr\u00E9avis.\n
--- jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2013-09-06 11:28:35.000000000 -0700
-+++ jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2014-04-20 12:39:19.000000000 -0700
@@ -34,11 +34,11 @@
java.launcher.ergo.message2 =\ \u3053\u308C\u306F\u30B5\u30FC\u30D0\u30FC\u30AF\u30E9\u30B9\u306E\u30DE\u30B7\u30F3\u3067\u5B9F\u884C\u3057\u3066\u3044\u308B\u305F\u3081\u3067\u3059\u3002\n
@@ -49394,7 +36429,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FMac OS X\u56FA\u6709\u3067\u3059\u3002\n -XstartOnFirstThread\n main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n -Xdock:name=<application name>"\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n -Xdock:icon=<path to icon file>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
--- jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2013-09-06 11:28:35.000000000 -0700
-+++ jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2014-04-20 12:39:19.000000000 -0700
@@ -34,10 +34,11 @@
java.launcher.ergo.message2 =\ \uC11C\uBC84\uAE09 \uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC2E4\uD589 \uC911\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.\n
@@ -49410,7 +36445,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n -XstartOnFirstThread\n \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xdock:name=<application name>"\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n -Xdock:icon=<path to icon file>\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
--- jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2013-09-06 11:28:35.000000000 -0700
-+++ jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2014-04-20 12:39:19.000000000 -0700
@@ -34,7 +34,7 @@
java.launcher.ergo.message2 =\ porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
@@ -49421,7 +36456,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\ -Xmixed execu\u00E7\u00E3o no modo misto (default)\n -Xint execu\u00E7\u00E3o somente no modo interpretado\n -Xbootclasspath:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n define o caminho de pesquisa para classes e recursos de inicializa\u00E7\u00E3o\n -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n anexa no final do caminho da classe de inicializa\u00E7\u00E3o\n -Xbootclasspath/p:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n anexa no in\u00EDcio do caminho da classe de inicializa\u00E7\u00E3o\n -Xdiag mostra mensagens de diagn\u00F3stico adicionais\n -Xnoclassgc desativa a coleta de lixo da classe\n -Xincgc ativa a coleta de lixo incremental\n -Xloggc:<arquivo> registra o status do GC status em um arquivo com marca\u00E7\u00F5es de data e hor\u00E1rio\n -Xbatch desativa a compila\u00E7\u00E3o em segundo plano\n -Xms<tamanho> define o tamanho inicial do heap Java\n -Xmx<tamanho> define o tamanho m\u00E1ximo do heap Java\n -Xss<tamanho> define o tamanho da pilha de threads java\n -Xprof produz dados de perfil da cpu\n -Xfuture ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo de exig\u00EAncia, prevendo o valor default futuro\n -Xrs reduz o uso de sinais do SO pelo(a) Java/VM (consulte a documenta\u00E7\u00E3o)\n -Xcheck:jni executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es da JNI\n -Xshare:off n\u00E3o tenta usar dados da classe compartilhada\n -Xshare:auto se poss\u00EDvel, usa dados da classe compartilhada (default)\n -Xshare:on requer o uso de dados da classe compartilhada, caso contr\u00E1rio haver\u00E1 falha.\n -XshowSettings mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:all\n mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 vm e continua\n -XshowSettings:properties\n mostra todas as defini\u00E7\u00F5es da propriedade e continua\n -XshowSettings:locale\n mostra todas as defini\u00E7\u00F5es relativas \u00E0s configura\u00E7\u00F5es regionais e continua\n\nAs -X options n\u00E3o s\u00E3o padronizadas e est\u00E3o sujeitas a altera\u00E7\u00F5es sem aviso.\n
--- jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2013-09-06 11:28:35.000000000 -0700
-+++ jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2013-12-01 11:14:34.000000000 -0800
++++ jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2014-04-20 12:39:21.000000000 -0700
@@ -40,7 +40,17 @@
public HotSpotDiagnostic() {
}
@@ -49441,8 +36476,157 @@
public List<VMOption> getDiagnosticOptions() {
List<Flag> allFlags = Flag.getAllFlags();
+--- jdk/src/share/classes/sun/misc/InnocuousThread.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/src/share/classes/sun/misc/InnocuousThread.java 2014-04-20 12:39:21.000000000 -0700
+@@ -0,0 +1,121 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNUNSAFE 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 WITHOUNSAFET
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICUNSAFELAR PUNSAFERPOSE. See the GNUNSAFE 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 GNUNSAFE 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 UNSAFESA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 UNSAFESA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.misc;
++
++import java.security.AccessControlContext;
++import java.security.ProtectionDomain;
++
++/**
++ * A thread that has no permissions, is not a member of any user-defined
++ * ThreadGroup and supports the ability to erase ThreadLocals.
++ *
++ * @implNote Based on the implementation of InnocuousForkJoinWorkerThread.
++ */
++public final class InnocuousThread extends Thread {
++ private static final Unsafe UNSAFE;
++ private static final ThreadGroup THREADGROUP;
++ private static final AccessControlContext ACC;
++ private static final long THREADLOCALS;
++ private static final long INHERITABLETHREADLOCALS;
++ private static final long INHERITEDACCESSCONTROLCONTEXT;
++
++ public InnocuousThread(Runnable target) {
++ super(THREADGROUP, target, "anInnocuousThread");
++ UNSAFE.putOrderedObject(this, INHERITEDACCESSCONTROLCONTEXT, ACC);
++ eraseThreadLocals();
++ }
++
++ @Override
++ public ClassLoader getContextClassLoader() {
++ // always report system class loader
++ return ClassLoader.getSystemClassLoader();
++ }
++
++ @Override
++ public void setUncaughtExceptionHandler(UncaughtExceptionHandler x) {
++ // silently fail
++ }
++
++ @Override
++ public void setContextClassLoader(ClassLoader cl) {
++ throw new SecurityException("setContextClassLoader");
++ }
++
++ // ensure run method is run only once
++ private volatile boolean hasRun;
++
++ @Override
++ public void run() {
++ if (Thread.currentThread() == this && !hasRun) {
++ hasRun = true;
++ super.run();
++ }
++ }
++
++ /**
++ * Drops all thread locals (and inherited thread locals).
++ */
++ public void eraseThreadLocals() {
++ UNSAFE.putObject(this, THREADLOCALS, null);
++ UNSAFE.putObject(this, INHERITABLETHREADLOCALS, null);
++ }
++
++ // Use Unsafe to access Thread group and ThreadGroup parent fields
++ static {
++ try {
++ ACC = new AccessControlContext(new ProtectionDomain[] {
++ new ProtectionDomain(null, null)
++ });
++
++ // Find and use topmost ThreadGroup as parent of new group
++ UNSAFE = Unsafe.getUnsafe();
++ Class<?> tk = Thread.class;
++ Class<?> gk = ThreadGroup.class;
++
++ THREADLOCALS = UNSAFE.objectFieldOffset
++ (tk.getDeclaredField("threadLocals"));
++ INHERITABLETHREADLOCALS = UNSAFE.objectFieldOffset
++ (tk.getDeclaredField("inheritableThreadLocals"));
++ INHERITEDACCESSCONTROLCONTEXT = UNSAFE.objectFieldOffset
++ (tk.getDeclaredField("inheritedAccessControlContext"));
++
++ long tg = UNSAFE.objectFieldOffset(tk.getDeclaredField("group"));
++ long gp = UNSAFE.objectFieldOffset(gk.getDeclaredField("parent"));
++ ThreadGroup group = (ThreadGroup)
++ UNSAFE.getObject(Thread.currentThread(), tg);
++
++ while (group != null) {
++ ThreadGroup parent = (ThreadGroup)UNSAFE.getObject(group, gp);
++ if (parent == null)
++ break;
++ group = parent;
++ }
++ THREADGROUP = new ThreadGroup(group, "InnocuousThreadGroup");
++ } catch (Exception e) {
++ throw new Error(e);
++ }
++ }
++}
+--- jdk/src/share/classes/sun/misc/JavaAWTAccess.java 2013-09-06 11:28:37.000000000 -0700
++++ jdk/src/share/classes/sun/misc/JavaAWTAccess.java 2014-04-20 12:39:21.000000000 -0700
+@@ -26,14 +26,16 @@
+ package sun.misc;
+
+ public interface JavaAWTAccess {
+- public Object getContext();
+- public Object getExecutionContext();
+
+- public Object get(Object context, Object key);
+- public void put(Object context, Object key, Object value);
+- public void remove(Object context, Object key);
++ // Returns the AppContext used for applet logging isolation, or null if
++ // no isolation is required.
++ // If there's no applet, or if the caller is a stand alone application,
++ // or running in the main app context, returns null.
++ // Otherwise, returns the AppContext of the calling applet.
++ public Object getAppletContext();
+
+- // convenience methods whose context is the object returned by getContext()
++ // convenience methods to cache objects in the current thread group's
++ // AppContext
+ public Object get(Object key);
+ public void put(Object key, Object value);
+ public void remove(Object key);
--- jdk/src/share/classes/sun/misc/JavaLangAccess.java 2013-09-06 11:28:37.000000000 -0700
-+++ jdk/src/share/classes/sun/misc/JavaLangAccess.java 2013-12-01 11:14:34.000000000 -0800
++++ jdk/src/share/classes/sun/misc/JavaLangAccess.java 2014-04-20 12:39:21.000000000 -0700
@@ -25,6 +25,7 @@
package sun.misc;
@@ -49462,8 +36646,89 @@
+ */
+ Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
}
+--- jdk/src/share/classes/sun/misc/Service.java 2013-09-06 11:28:37.000000000 -0700
++++ jdk/src/share/classes/sun/misc/Service.java 2014-04-20 12:39:21.000000000 -0700
+@@ -299,7 +299,7 @@
+ return service.cast(c.newInstance());
+ } catch (Throwable x) {
+ fail(service,
+- "Provider " + cn + " could not be instantiated: " + x,
++ "Provider " + cn + " could not be instantiated",
+ x);
+ }
+ return null; /* This cannot happen */
+--- jdk/src/share/classes/sun/misc/SharedSecrets.java 2013-09-06 11:28:37.000000000 -0700
++++ jdk/src/share/classes/sun/misc/SharedSecrets.java 2014-04-20 12:39:21.000000000 -0700
+@@ -197,9 +197,6 @@
+ public static JavaAWTAccess getJavaAWTAccess() {
+ // this may return null in which case calling code needs to
+ // provision for.
+- if (javaAWTAccess == null || javaAWTAccess.getContext() == null) {
+- return null;
+- }
+ return javaAWTAccess;
+ }
+ }
+--- jdk/src/share/classes/sun/misc/ThreadGroupUtils.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/src/share/classes/sun/misc/ThreadGroupUtils.java 2014-04-20 12:39:21.000000000 -0700
+@@ -0,0 +1,55 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.misc;
++
++/**
++ * A utility class needed to access the root {@code ThreadGroup}
++ *
++ * The class should not depend on any others, because it' called from JNI_OnLoad of the AWT
++ * native library. Triggering class loading could could lead to a deadlock.
++ */
++public final class ThreadGroupUtils {
++
++ private ThreadGroupUtils() {
++ // Avoid instantiation
++ }
++
++ /**
++ * Returns a root thread group.
++ * Should be called with {@link sun.security.util.SecurityConstants#MODIFY_THREADGROUP_PERMISSION}
++ *
++ * @return a root {@code ThreadGroup}
++ */
++ public static ThreadGroup getRootThreadGroup() {
++ ThreadGroup currentTG = Thread.currentThread().getThreadGroup();
++ ThreadGroup parentTG = currentTG.getParent();
++ while (parentTG != null) {
++ currentTG = parentTG;
++ parentTG = currentTG.getParent();
++ }
++ return currentTG;
++ }
++}
--- jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2013-09-06 11:28:38.000000000 -0700
-+++ jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -428,6 +428,10 @@
throw new AlreadyBoundException();
InetSocketAddress isa = (local == null) ?
@@ -49475,8 +36740,29 @@
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
Net.bind(fd, isa.getAddress(), isa.getPort());
localAddress = Net.localAddress(fd);
+--- jdk/src/share/classes/sun/nio/ch/Invoker.java 2013-09-06 11:28:39.000000000 -0700
++++ jdk/src/share/classes/sun/nio/ch/Invoker.java 2014-04-20 12:39:21.000000000 -0700
+@@ -130,6 +130,18 @@
+
+ // clear interrupt
+ Thread.interrupted();
++
++ // clear thread locals when in default thread pool
++ if (System.getSecurityManager() != null) {
++ Thread me = Thread.currentThread();
++ if (me instanceof sun.misc.InnocuousThread) {
++ GroupAndInvokeCount thisGroupAndInvokeCount = myGroupAndInvokeCount.get();
++ ((sun.misc.InnocuousThread)me).eraseThreadLocals();
++ if (thisGroupAndInvokeCount != null) {
++ myGroupAndInvokeCount.set(thisGroupAndInvokeCount);
++ }
++ }
++ }
+ }
+
+ /**
--- jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2013-09-06 11:28:39.000000000 -0700
-+++ jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -599,6 +599,10 @@
throw new AlreadyBoundException();
InetSocketAddress isa = (local == null) ?
@@ -49488,8 +36774,73 @@
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
Net.bind(fd, isa.getAddress(), isa.getPort());
localAddress = Net.localAddress(fd);
+--- jdk/src/share/classes/sun/nio/ch/ThreadPool.java 2013-09-06 11:28:39.000000000 -0700
++++ jdk/src/share/classes/sun/nio/ch/ThreadPool.java 2014-04-20 12:39:21.000000000 -0700
+@@ -27,6 +27,7 @@
+
+ import java.util.concurrent.*;
+ import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import sun.security.action.GetPropertyAction;
+ import sun.security.action.GetIntegerAction;
+
+@@ -39,14 +40,6 @@
+ "java.nio.channels.DefaultThreadPool.threadFactory";
+ private static final String DEFAULT_THREAD_POOL_INITIAL_SIZE =
+ "java.nio.channels.DefaultThreadPool.initialSize";
+- private static final ThreadFactory defaultThreadFactory = new ThreadFactory() {
+- @Override
+- public Thread newThread(Runnable r) {
+- Thread t = new Thread(r);
+- t.setDaemon(true);
+- return t;
+- }
+- };
+
+ private final ExecutorService executor;
+
+@@ -79,7 +72,29 @@
+ }
+
+ static ThreadFactory defaultThreadFactory() {
+- return defaultThreadFactory;
++ if (System.getSecurityManager() == null) {
++ return new ThreadFactory() {
++ @Override
++ public Thread newThread(Runnable r) {
++ Thread t = new Thread(r);
++ t.setDaemon(true);
++ return t;
++ }
++ };
++ } else {
++ return new ThreadFactory() {
++ @Override
++ public Thread newThread(final Runnable r) {
++ return (Thread) AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ Thread t = new sun.misc.InnocuousThread(r);
++ t.setDaemon(true);
++ return t;
++ }
++ });
++ }
++ };
++ }
+ }
+
+ private static class DefaultThreadPoolHolder {
+@@ -100,7 +115,7 @@
+ // default to thread factory that creates daemon threads
+ ThreadFactory threadFactory = getDefaultThreadPoolThreadFactory();
+ if (threadFactory == null)
+- threadFactory = defaultThreadFactory;
++ threadFactory = defaultThreadFactory();
+ // create thread pool
+ ExecutorService executor =
+ new ThreadPoolExecutor(0, Integer.MAX_VALUE,
--- jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2013-09-06 11:28:39.000000000 -0700
-+++ jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2013-12-01 11:14:35.000000000 -0800
++++ jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2014-04-20 12:39:21.000000000 -0700
@@ -1031,6 +1031,24 @@
"ebcdic-s-871+euro"
});
@@ -49516,7 +36867,7 @@
--- jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 2013-12-01 11:14:35.000000000 -0800
++++ jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 2014-04-20 12:39:21.000000000 -0700
@@ -0,0 +1,1875 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -51394,7 +38745,7 @@
+ }
+}
--- jdk/src/share/classes/sun/print/PSPrinterJob.java 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-04-20 12:39:21.000000000 -0700
@@ -1568,7 +1568,7 @@
}
@@ -51405,7 +38756,7 @@
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
--- jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2014-04-20 12:39:21.000000000 -0700
@@ -36,29 +36,29 @@
label.pstype=Tipo:
label.rangeto=A
@@ -51443,7 +38794,7 @@
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
--- jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2014-01-18 12:16:25.000000000 -0800
++++ jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2014-04-20 12:39:21.000000000 -0700
@@ -29,7 +29,7 @@
dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
#
@@ -51492,7 +38843,7 @@
error.pagerange=Plage de pages non valide. Sp\u00E9cifiez les valeurs de nouveau (ex. : 1-3,5,7-10)
error.destination=Nom de fichier non valide ; recommencez
--- jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2014-04-20 12:39:21.000000000 -0700
@@ -47,8 +47,8 @@
label.rightmargin=&destro
#
@@ -51514,7 +38865,7 @@
tab.pagesetup=Impo&sta pagina
#
--- jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2014-04-20 12:39:21.000000000 -0700
@@ -31,7 +31,7 @@
label.info=Informa\u00E7\u00F5es:
label.jobname=Nome do &Job:
@@ -51563,7 +38914,7 @@
error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
error.destination=Nome de arquivo inv\u00E1lido; tente novamente
--- jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2013-09-06 11:28:40.000000000 -0700
-+++ jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2014-04-20 12:39:21.000000000 -0700
@@ -17,7 +17,7 @@
button.properties=&Egenskaper...
#
@@ -51611,7 +38962,7 @@
error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
--- jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2013-09-06 11:28:41.000000000 -0700
-+++ jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -25,13 +25,17 @@
package sun.reflect.generics.reflectiveObjects;
@@ -51669,7 +39020,7 @@
GenericDeclaration thatDecl = that.getGenericDeclaration();
--- jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2013-09-06 11:28:41.000000000 -0700
-+++ jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2014-04-20 12:39:21.000000000 -0700
@@ -26,9 +26,13 @@
package sun.reflect.misc;
@@ -51776,7 +39127,7 @@
+ }
}
--- jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-09-06 11:28:41.000000000 -0700
-+++ jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -352,7 +352,7 @@
public RegistryImpl run() throws RemoteException {
return new RegistryImpl(regPort);
@@ -51804,7 +39155,7 @@
perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*"));
perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
--- jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2013-09-06 11:28:42.000000000 -0700
-+++ jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2014-04-20 12:39:21.000000000 -0700
@@ -87,7 +87,7 @@
rmid.restart.service.warning=\nrmid: (\uACBD\uACE0) \uC11C\uBE44\uC2A4 \uC7AC\uC2DC\uC791\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
@@ -51815,7 +39166,7 @@
# "rmid" should not be translated
rmid.log.snapshot.warning=\nrmid: (\uC2EC\uAC01) \uB85C\uADF8 \uC2A4\uB0C5\uC0F7\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
--- jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2013-09-06 11:28:42.000000000 -0700
-+++ jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2013-12-01 11:14:35.000000000 -0800
++++ jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
@@ -51837,7 +39188,7 @@
-
}
--- jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2013-09-06 11:28:42.000000000 -0700
-+++ jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -51919,7 +39270,7 @@
+ }
}
--- jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2013-09-06 11:28:42.000000000 -0700
-+++ jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2013-12-01 11:14:35.000000000 -0800
++++ jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -51937,7 +39288,7 @@
} catch (GSSException e) {
// skip to next element
--- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2013-09-06 11:28:43.000000000 -0700
-+++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2014-04-20 12:39:21.000000000 -0700
@@ -83,7 +83,8 @@
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS")) {
@@ -51949,7 +39300,7 @@
"libgssapi.so",
"libgssapi_krb5.so",
--- jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-09-06 11:28:43.000000000 -0700
-+++ jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-04-20 12:39:21.000000000 -0700
@@ -239,11 +239,15 @@
savedException = e;
}
@@ -51971,7 +39322,7 @@
}
return ibuf;
--- jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2013-09-06 11:28:43.000000000 -0700
-+++ jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2014-04-20 12:39:21.000000000 -0700
@@ -31,6 +31,8 @@
package sun.security.krb5.internal;
@@ -52003,7 +39354,7 @@
}
--- jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -52030,7 +39381,7 @@
* Initialize an PKCS8Key object from an input stream. The data
* on that input stream must be encoded using DER, obeying the
--- jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52120,7 +39471,7 @@
private static final class P11ECPublicKey extends P11Key
--- jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52138,7 +39489,7 @@
key = new SecretKeySpec(newBytes, algorithm);
}
--- jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52179,7 +39530,7 @@
implInit(Cipher.DECRYPT_MODE, p11Key);
if (wrappedKey.length > maxInputSize) {
--- jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52207,7 +39558,7 @@
// r and s each occupy half the array
byte[] res = new byte[k << 1];
--- jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -52266,7 +39617,7 @@
}
--- jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2014-04-20 12:39:21.000000000 -0700
@@ -131,20 +131,6 @@
return b;
}
@@ -52289,7 +39640,7 @@
byte[] b = bi.toByteArray();
if ((b.length > 1) && (b[0] == 0)) {
--- jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52436,7 +39787,7 @@
-
}
--- jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2013-09-06 11:28:44.000000000 -0700
-+++ jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
@@ -52456,8 +39807,114 @@
protected void parseKeyBits() throws InvalidKeyException {
try {
DerInputStream in = new DerInputStream(key);
+--- jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2013-09-06 11:28:44.000000000 -0700
++++ jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -173,8 +173,8 @@
+ md.update(p.getProperty(s).getBytes());
+ }
+
+- md.update
+- (InetAddress.getLocalHost().toString().getBytes());
++ // Include network adapter names (and a Mac address)
++ addNetworkAdapterInfo(md);
+
+ // The temporary dir
+ File f = new File(p.getProperty("java.io.tmpdir"));
+@@ -212,6 +212,31 @@
+ return md.digest();
+ }
+
++ /*
++ * Include network adapter names and, if available, a Mac address
++ *
++ * See also java.util.concurrent.ThreadLocalRandom.initialSeed()
++ */
++ private static void addNetworkAdapterInfo(MessageDigest md) {
++
++ try {
++ Enumeration<NetworkInterface> ifcs =
++ NetworkInterface.getNetworkInterfaces();
++ while (ifcs.hasMoreElements()) {
++ NetworkInterface ifc = ifcs.nextElement();
++ md.update(ifc.toString().getBytes());
++ if (!ifc.isVirtual()) { // skip fake addresses
++ byte[] bs = ifc.getHardwareAddress();
++ if (bs != null) {
++ md.update(bs);
++ break;
++ }
++ }
++ }
++ } catch (Exception ignore) {
++ }
++ }
++
+ /**
+ * Helper function to convert a long into a byte array (least significant
+ * byte first).
+--- jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java 2013-09-06 11:28:45.000000000 -0700
++++ jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java 2014-04-20 12:39:21.000000000 -0700
+@@ -75,7 +75,7 @@
+ private PublicKey prevPubKey;
+
+ private final static Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
+- EnumSet.of(CryptoPrimitive.SIGNATURE);
++ Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
+
+ private final static DisabledAlgorithmConstraints
+ certPathDefaultConstraints = new DisabledAlgorithmConstraints(
+--- jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java 2013-09-06 11:28:45.000000000 -0700
++++ jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java 2014-04-20 12:39:21.000000000 -0700
+@@ -50,6 +50,7 @@
+ import sun.security.util.Cache;
+ import sun.security.util.Debug;
+ import sun.security.x509.X500Name;
++import sun.security.action.GetBooleanAction;
+ import sun.security.action.GetPropertyAction;
+
+ /**
+@@ -135,6 +136,14 @@
+ private final static String PROP_LIFETIME =
+ "sun.security.certpath.ldap.cache.lifetime";
+
++ /*
++ * Internal system property, that when set to "true", disables the
++ * JNDI application resource files lookup to prevent recursion issues
++ * when validating signed JARs with LDAP URLs in certificates.
++ */
++ private final static String PROP_DISABLE_APP_RESOURCE_FILES =
++ "sun.security.certpath.ldap.disable.app.resource.files";
++
+ static {
+ String s = AccessController.doPrivileged(
+ new GetPropertyAction(PROP_LIFETIME));
+@@ -236,6 +245,17 @@
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.ldap.LdapCtxFactory");
+ env.put(Context.PROVIDER_URL, url);
++
++ // If property is set to true, disable application resource file lookup.
++ boolean disableAppResourceFiles = AccessController.doPrivileged(
++ new GetBooleanAction(PROP_DISABLE_APP_RESOURCE_FILES));
++ if (disableAppResourceFiles) {
++ if (debug != null) {
++ debug.println("LDAPCertStore disabling app resource files");
++ }
++ env.put("com.sun.naming.disable.app.resource.files", "true");
++ }
++
+ try {
+ ctx = new InitialDirContext(env);
+ /*
--- jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
@@ -52465,25 +39922,132 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -318,33 +318,53 @@
+@@ -25,11 +25,9 @@
+
+ package sun.security.rsa;
+
+-import java.math.BigInteger;
+ import java.util.*;
+
+ import java.security.*;
+-import java.security.interfaces.*;
+ import java.security.spec.*;
+
+ import javax.crypto.BadPaddingException;
+@@ -41,21 +39,41 @@
+ /**
+ * RSA padding and unpadding.
+ *
+- * Format of PKCS#1 v1.5 padding is:
++ * The various PKCS#1 versions can be found in the EMC/RSA Labs
++ * web site, which is currently:
++ *
++ * http://www.emc.com/emc-plus/rsa-labs/index.htm
++ *
++ * or in the IETF RFCs derived from the above PKCS#1 standards.
++ *
++ * RFC 2313: v1.5
++ * RFC 2437: v2.0
++ * RFC 3447: v2.1
++ *
++ * The format of PKCS#1 v1.5 padding is:
++ *
+ * 0x00 | BT | PS...PS | 0x00 | data...data
++ *
+ * where BT is the blocktype (1 or 2). The length of the entire string
+ * must be the same as the size of the modulus (i.e. 128 byte for a 1024 bit
+ * key). Per spec, the padding string must be at least 8 bytes long. That
+ * leaves up to (length of key in bytes) - 11 bytes for the data.
+ *
+- * OAEP padding is a bit more complicated and has a number of options.
+- * We support:
++ * OAEP padding was introduced in PKCS#1 v2.0 and is a bit more complicated
++ * and has a number of options. We support:
++ *
+ * . arbitrary hash functions ('Hash' in the specification), MessageDigest
+ * implementation must be available
+ * . MGF1 as the mask generation function
+ * . the empty string as the default value for label L and whatever
+ * specified in javax.crypto.spec.OAEPParameterSpec
+ *
++ * The algorithms (representations) are forwards-compatible: that is,
++ * the algorithm described in previous releases are in later releases.
++ * However, additional comments/checks/clarifications were added to the
++ * later versions based on real-world experience (e.g. stricter v1.5
++ * format checking.)
++ *
+ * Note: RSA keys should be at least 512 bits long
+ *
+ * @since 1.5
+@@ -156,7 +174,8 @@
+ throw new InvalidAlgorithmParameterException
+ ("Unsupported MGF algo: " + mgfName);
+ }
+- mgfMdName = ((MGF1ParameterSpec)spec.getMGFParameters()).getDigestAlgorithm();
++ mgfMdName = ((MGF1ParameterSpec)spec.getMGFParameters())
++ .getDigestAlgorithm();
+ PSource pSrc = spec.getPSource();
+ String pSrcAlgo = pSrc.getAlgorithm();
+ if (!pSrcAlgo.equalsIgnoreCase("PSpecified")) {
+@@ -198,7 +217,7 @@
+ */
+ private static byte[] getInitialHash(MessageDigest md,
+ byte[] digestInput) {
+- byte[] result = null;
++ byte[] result;
+ if ((digestInput == null) || (digestInput.length == 0)) {
+ String digestName = md.getAlgorithm();
+ result = emptyHashes.get(digestName);
+@@ -213,8 +232,8 @@
+ }
/**
- * PKCS#1 v1.5 unpadding (blocktype 1 and 2).
+- * Return the maximum size of the plaintext data that can be processed using
+- * this object.
++ * Return the maximum size of the plaintext data that can be processed
++ * using this object.
+ */
+ public int getMaxDataSize() {
+ return maxDataSize;
+@@ -262,7 +281,7 @@
+ */
+ public byte[] unpad(byte[] padded) throws BadPaddingException {
+ if (padded.length != paddedSize) {
+- throw new BadPaddingException("Padded length must be " + paddedSize);
++ throw new BadPaddingException("Decryption error");
+ }
+ switch (type) {
+ case PAD_NONE:
+@@ -282,7 +301,8 @@
+ */
+ private byte[] padV15(byte[] data) throws BadPaddingException {
+ byte[] padded = new byte[paddedSize];
+- System.arraycopy(data, 0, padded, paddedSize - data.length, data.length);
++ System.arraycopy(data, 0, padded, paddedSize - data.length,
++ data.length);
+ int psSize = paddedSize - 3 - data.length;
+ int k = 0;
+ padded[k++] = 0;
+@@ -317,35 +337,53 @@
+ }
+
+ /**
+- * PKCS#1 v1.5 unpadding (blocktype 1 and 2).
++ * PKCS#1 v1.5 unpadding (blocktype 1 (signature) and 2 (encryption)).
+ *
+ * Note that we want to make it a constant-time operation
*/
private byte[] unpadV15(byte[] padded) throws BadPaddingException {
int k = 0;
-+ BadPaddingException bpe = null;
++ boolean bp = false;
+
if (padded[k++] != 0) {
- throw new BadPaddingException("Data must start with zero");
-+ bpe = new BadPaddingException("Data must start with zero");
++ bp = true;
}
-- if (padded[k++] != type) {
+ if (padded[k++] != type) {
- throw new BadPaddingException("Blocktype mismatch: " + padded[1]);
-+ if (padded[k++] != type && bpe == null) {
-+ bpe = new BadPaddingException("Blocktype mismatch: " + padded[1]);
++ bp = true;
}
- while (true) {
+ int p = 0;
@@ -52491,50 +40055,140 @@
int b = padded[k++] & 0xff;
- if (b == 0) {
- break;
-+ if (b == 0 && p == 0) {
++ if ((b == 0) && (p == 0)) {
+ p = k;
}
- if (k == padded.length) {
- throw new BadPaddingException("Padding string not terminated");
-+ if (k == padded.length && p == 0 && bpe == null) {
-+ bpe = new BadPaddingException("Padding string not terminated");
++ if ((k == padded.length) && (p == 0)) {
++ bp = true;
}
- if ((type == PAD_BLOCKTYPE_1) && (b != 0xff)) {
- throw new BadPaddingException("Padding byte not 0xff: " + b);
+ if ((type == PAD_BLOCKTYPE_1) && (b != 0xff) &&
-+ p == 0 && bpe == null) {
-+ bpe = new BadPaddingException("Padding byte not 0xff: " + b);
++ (p == 0)) {
++ bp = true;
}
}
- int n = padded.length - k;
-- if (n > maxDataSize) {
-- throw new BadPaddingException("Padding string too short");
+ int n = padded.length - p;
-+ if (n > maxDataSize && bpe == null) {
-+ bpe = new BadPaddingException("Padding string too short");
+ if (n > maxDataSize) {
+- throw new BadPaddingException("Padding string too short");
++ bp = true;
}
+
+ // copy useless padding array for a constant-time method
-+ //
-+ // Is it necessary?
+ byte[] padding = new byte[p];
+ System.arraycopy(padded, 0, padding, 0, p);
+
byte[] data = new byte[n];
- System.arraycopy(padded, padded.length - n, data, 0, n);
+- return data;
+ System.arraycopy(padded, p, data, 0, n);
+
-+ if (bpe == null) {
-+ bpe = new BadPaddingException("Unused exception");
-+ } else {
++ BadPaddingException bpe = new BadPaddingException("Decryption error");
++
++ if (bp) {
+ throw bpe;
++ } else {
++ return data;
+ }
+ }
+
+ /**
+@@ -404,10 +442,11 @@
+ */
+ private byte[] unpadOAEP(byte[] padded) throws BadPaddingException {
+ byte[] EM = padded;
++ boolean bp = false;
+ int hLen = lHash.length;
+
+ if (EM[0] != 0) {
+- throw new BadPaddingException("Data must start with zero");
++ bp = true;
+ }
+
+ int seedStart = 1;
+@@ -422,29 +461,48 @@
+ // verify lHash == lHash'
+ for (int i = 0; i < hLen; i++) {
+ if (lHash[i] != EM[dbStart + i]) {
+- throw new BadPaddingException("lHash mismatch");
++ bp = true;
+ }
+ }
+
+- // skip over padding (0x00 bytes)
+- int i = dbStart + hLen;
+- while (EM[i] == 0) {
+- i++;
+- if (i >= EM.length) {
+- throw new BadPaddingException("Padding string not terminated");
++ int padStart = dbStart + hLen;
++ int onePos = -1;
++
++ for (int i = padStart; i < EM.length; i++) {
++ int value = EM[i];
++ if (onePos == -1) {
++ if (value == 0x00) {
++ // continue;
++ } else if (value == 0x01) {
++ onePos = i;
++ } else { // Anything other than {0,1} is bad.
++ bp = true;
++ }
+ }
+ }
+
+- if (EM[i++] != 1) {
+- throw new BadPaddingException
+- ("Padding string not terminated by 0x01 byte");
++ // We either ran off the rails or found something other than 0/1.
++ if (onePos == -1) {
++ bp = true;
++ onePos = EM.length - 1; // Don't inadvertently return any data.
+ }
+
+- int mLen = EM.length - i;
+- byte[] m = new byte[mLen];
+- System.arraycopy(EM, i, m, 0, mLen);
++ int mStart = onePos + 1;
+
+- return m;
++ // copy useless padding array for a constant-time method
++ byte [] tmp = new byte[mStart - padStart];
++ System.arraycopy(EM, padStart, tmp, 0, tmp.length);
++
++ byte [] m = new byte[EM.length - mStart];
++ System.arraycopy(EM, mStart, m, 0, m.length);
++
++ BadPaddingException bpe = new BadPaddingException("Decryption error");
+
- return data;
++ if (bp) {
++ throw bpe;
++ } else {
++ return m;
++ }
}
+ /**
+@@ -458,7 +516,7 @@
+ private void mgf1(byte[] seed, int seedOfs, int seedLen,
+ byte[] out, int outOfs, int maskLen) throws BadPaddingException {
+ byte[] C = new byte[4]; // 32 bit counter
+- byte[] digest = new byte[20]; // 20 bytes is length of SHA-1 digest
++ byte[] digest = new byte[mgfMd.getDigestLength()];
+ while (maskLen > 0) {
+ mgfMd.update(seed, seedOfs, seedLen);
+ mgfMd.update(C);
+@@ -479,5 +537,4 @@
+ }
+ }
+ }
+-
+ }
--- jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -52573,7 +40227,7 @@
-
}
--- jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -52594,7 +40248,7 @@
-
}
--- jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52705,7 +40359,7 @@
/*
--- jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -52927,9 +40581,30 @@
}
}
+--- jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-09-06 11:28:45.000000000 -0700
++++ jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-04-20 12:39:21.000000000 -0700
+@@ -68,7 +68,7 @@
+
+ // performance optimization
+ private final static Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
+- EnumSet.of(CryptoPrimitive.SIGNATURE);
++ Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
+
+ // supported pairs of signature and hash algorithm
+ private final static Map<Integer, SignatureAndHashAlgorithm> supportedMap;
--- jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-01-18 12:16:27.000000000 -0800
-@@ -155,8 +155,13 @@
++++ jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-04-20 12:39:21.000000000 -0700
+@@ -88,9 +88,6 @@
+
+ private static final String META_INF = "META-INF/";
+
+- // prefix for new signature-related files in META-INF directory
+- private static final String SIG_PREFIX = META_INF + "SIG-";
+-
+ private static final Class[] PARAM_STRING = { String.class };
+
+ private static final String NONE = "NONE";
+@@ -155,8 +152,13 @@
private String altSignerClasspath = null;
private ZipFile zipFile = null;
@@ -52944,7 +40619,7 @@
private boolean notYetValidCert = false;
private boolean chainNotValidated = false;
private boolean notSignedByAlias = false;
-@@ -255,9 +260,6 @@
+@@ -255,9 +257,6 @@
if (strict) {
int exitCode = 0;
@@ -52954,7 +40629,7 @@
if (chainNotValidated || hasExpiredCert || notYetValidCert) {
exitCode |= 4;
}
-@@ -746,14 +748,25 @@
+@@ -746,14 +745,25 @@
System.out.println(rb.getString(
"jar.is.unsigned.signatures.missing.or.not.parsable."));
} else {
@@ -52987,7 +40662,7 @@
if (badKeyUsage) {
System.out.println(
rb.getString("This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing."));
-@@ -777,10 +790,6 @@
+@@ -777,10 +787,6 @@
System.out.println(rb.getString(
"This.jar.contains.entries.whose.signer.certificate.has.expired."));
}
@@ -52998,7 +40673,7 @@
if (notYetValidCert) {
System.out.println(rb.getString(
"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid."));
-@@ -799,10 +808,29 @@
+@@ -799,10 +805,29 @@
if (aliasNotInStore) {
System.out.println(rb.getString("This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore."));
}
@@ -53029,7 +40704,7 @@
}
}
}
-@@ -862,6 +890,9 @@
+@@ -862,6 +887,9 @@
try {
boolean printValidity = true;
if (timestamp == null) {
@@ -53039,7 +40714,7 @@
x509Cert.checkValidity();
// test if cert will expire within six months
if (notAfter.getTime() < System.currentTimeMillis() + SIX_MONTHS) {
-@@ -1227,6 +1258,10 @@
+@@ -1227,6 +1255,10 @@
tsaCert = getTsaCert(tsaAlias);
}
@@ -53050,7 +40725,7 @@
SignatureFile.Block block = null;
try {
-@@ -1375,12 +1410,20 @@
+@@ -1375,12 +1407,20 @@
}
}
@@ -53076,7 +40751,7 @@
if (badKeyUsage) {
System.out.println(
rb.getString("The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing."));
-@@ -1399,9 +1442,6 @@
+@@ -1399,9 +1439,6 @@
if (hasExpiredCert) {
System.out.println(
rb.getString("The.signer.certificate.has.expired."));
@@ -53086,7 +40761,7 @@
} else if (notYetValidCert) {
System.out.println(
rb.getString("The.signer.certificate.is.not.yet.valid."));
-@@ -1411,6 +1451,24 @@
+@@ -1411,6 +1448,24 @@
System.out.println(
rb.getString("The.signer.s.certificate.chain.is.not.validated."));
}
@@ -53111,7 +40786,31 @@
}
// no IOException thrown in the above try clause, so disable
-@@ -1496,6 +1554,7 @@
+@@ -1458,22 +1513,7 @@
+ * . META-INF/*.EC
+ */
+ private boolean signatureRelated(String name) {
+- String ucName = name.toUpperCase(Locale.ENGLISH);
+- if (ucName.equals(JarFile.MANIFEST_NAME) ||
+- ucName.equals(META_INF) ||
+- (ucName.startsWith(SIG_PREFIX) &&
+- ucName.indexOf("/") == ucName.lastIndexOf("/"))) {
+- return true;
+- }
+-
+- if (ucName.startsWith(META_INF) &&
+- SignatureFileVerifier.isBlockOrSF(ucName)) {
+- // .SF/.DSA/.RSA/.EC files in META-INF subdirs
+- // are not considered signature-related
+- return (ucName.indexOf("/") == ucName.lastIndexOf("/"));
+- }
+-
+- return false;
++ return SignatureFileVerifier.isSigningRelated(name);
+ }
+
+ Map<CodeSigner,String> cacheForSignerInfo = new IdentityHashMap<>();
+@@ -1496,6 +1536,7 @@
timestamp = ts.getTimestamp();
} else {
timestamp = null;
@@ -53120,7 +40819,7 @@
// display the certificate(s). The first one is end-entity cert and
// its KeyUsage should be checked.
--- jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2014-04-20 12:39:21.000000000 -0700
@@ -110,9 +110,9 @@
{"Please.specify.alias.name", "Please specify alias name"},
{"Only.one.alias.can.be.specified", "Only one alias can be specified"},
@@ -53164,7 +40863,7 @@
/**
--- jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2014-04-20 12:39:21.000000000 -0700
@@ -79,7 +79,7 @@
{".verbose.suboptions.verbose.output.when.signing.verifying.",
"[-verbose[:suboptions]] \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
@@ -53206,7 +40905,7 @@
/**
--- jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2013-09-06 11:28:45.000000000 -0700
-+++ jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2014-04-20 12:39:21.000000000 -0700
@@ -53,7 +53,7 @@
{"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
"\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
@@ -53249,7 +40948,7 @@
/**
--- jdk/src/share/classes/sun/security/util/KeyUtil.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/KeyUtil.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/KeyUtil.java 2014-04-20 12:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
@@ -53283,7 +40982,7 @@
}
--- jdk/src/share/classes/sun/security/util/Resources_de.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/Resources_de.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/Resources_de.java 2014-04-20 12:39:21.000000000 -0700
@@ -444,7 +444,7 @@
{"Retain", "Beibehalten"},
@@ -53294,7 +40993,7 @@
{"Add.Public.Key.Alias", "Public Key-Alias hinzuf\u00FCgen"},
{"Remove.Public.Key.Alias", "Public Key-Alias entfernen"},
--- jdk/src/share/classes/sun/security/util/Resources_fr.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/Resources_fr.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/Resources_fr.java 2014-04-20 12:39:21.000000000 -0700
@@ -557,12 +557,12 @@
{"invalid.null.Class.provided", "classe NULL fournie non valide"},
{"Subject.", "Objet :\n"},
@@ -53313,7 +41012,7 @@
{"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
"tentative d'ajout d'un objet qui n'est pas une instance de java.security.Principal dans un ensemble de principaux du sujet"},
--- jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2014-04-20 12:39:21.000000000 -0700
@@ -310,7 +310,7 @@
"\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
{"Your.keystore.contains.keyStore.size.entries",
@@ -53324,7 +41023,7 @@
{"Not.X.509.certificate", "\u975E X.509 \u8BC1\u4E66"},
{"alias.has.no.public.key", "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5"},
--- jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2014-04-20 12:39:21.000000000 -0700
@@ -388,7 +388,7 @@
{"Certificate.chain.in.reply.does.not.verify.",
"\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
@@ -53335,7 +41034,7 @@
{"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "},
{"NO", "\u5426"},
--- jdk/src/share/classes/sun/security/util/SecurityConstants.java 2013-09-06 11:28:46.000000000 -0700
-+++ jdk/src/share/classes/sun/security/util/SecurityConstants.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/share/classes/sun/security/util/SecurityConstants.java 2014-04-20 12:39:21.000000000 -0700
@@ -257,5 +257,5 @@
// java.lang.SecurityManager
@@ -53343,8 +41042,63 @@
- new SocketPermission("localhost:1024-", SOCKET_LISTEN_ACTION);
+ new SocketPermission("localhost:0", SOCKET_LISTEN_ACTION);
}
+--- jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2013-09-06 11:28:46.000000000 -0700
++++ jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2014-04-20 12:39:21.000000000 -0700
+@@ -153,6 +153,52 @@
+ return false;
+ }
+
++ /**
++ * Yet another utility method used by JarVerifier and JarSigner
++ * to determine what files are signature related, which includes
++ * the MANIFEST, SF files, known signature block files, and other
++ * unknown signature related files (those starting with SIG- with
++ * an optional [A-Z0-9]{1,3} extension right inside META-INF).
++ *
++ * @param s file name
++ * @return true if the input file name is signature related
++ */
++ public static boolean isSigningRelated(String name) {
++ name = name.toUpperCase(Locale.ENGLISH);
++ if (!name.startsWith("META-INF/")) {
++ return false;
++ }
++ name = name.substring(9);
++ if (name.indexOf('/') != -1) {
++ return false;
++ }
++ if (isBlockOrSF(name) || name.equals("MANIFEST.MF")) {
++ return true;
++ } else if (name.startsWith("SIG-")) {
++ // check filename extension
++ // see http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Digital_Signatures
++ // for what filename extensions are legal
++ int extIndex = name.lastIndexOf('.');
++ if (extIndex != -1) {
++ String ext = name.substring(extIndex + 1);
++ // validate length first
++ if (ext.length() > 3 || ext.length() < 1) {
++ return false;
++ }
++ // then check chars, must be in [a-zA-Z0-9] per the jar spec
++ for (int index = 0; index < ext.length(); index++) {
++ char cc = ext.charAt(index);
++ // chars are promoted to uppercase so skip lowercase checks
++ if ((cc < 'A' || cc > 'Z') && (cc < '0' || cc > '9')) {
++ return false;
++ }
++ }
++ }
++ return true; // no extension is OK
++ }
++ return false;
++ }
++
+ /** get digest from cache */
+
+ private MessageDigest getDigest(String algorithm)
--- jdk/src/share/classes/sun/swing/SwingLazyValue.java 2013-09-06 11:28:47.000000000 -0700
-+++ jdk/src/share/classes/sun/swing/SwingLazyValue.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/swing/SwingLazyValue.java 2014-04-20 12:39:21.000000000 -0700
@@ -30,6 +30,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -53363,7 +41117,7 @@
if (methodName != null) {
Class[] types = getClassArray(args);
--- jdk/src/share/classes/sun/swing/SwingUtilities2.java 2013-09-06 11:28:47.000000000 -0700
-+++ jdk/src/share/classes/sun/swing/SwingUtilities2.java 2013-12-01 11:14:36.000000000 -0800
++++ jdk/src/share/classes/sun/swing/SwingUtilities2.java 2014-04-20 12:39:21.000000000 -0700
@@ -1301,6 +1301,19 @@
}
@@ -53385,7 +41139,7 @@
* access the system clipboard and if it is allowed gesture (if
* checkGesture true)
--- jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2014-04-20 12:39:21.000000000 -0700
@@ -30,4 +30,5 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
@@ -53393,7 +41147,7 @@
+#[bsd]sun.tools.attach.BsdAttachProvider
#[macosx]sun.tools.attach.BsdAttachProvider
--- jdk/src/share/classes/sun/tools/jar/Main.java 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/Main.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/Main.java 2014-04-20 12:39:21.000000000 -0700
@@ -51,6 +51,7 @@
String zname = "";
String[] files;
@@ -53465,7 +41219,7 @@
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
--- jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2014-04-20 12:39:21.000000000 -0700
@@ -44,6 +44,8 @@
{0} : could not create directory
error.incorrect.length=\
@@ -53476,7 +41230,7 @@
added manifest
out.update.manifest=\
--- jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(0 % gespeichert)
out.create=\ erstellt: {0}
@@ -53487,7 +41241,7 @@
usage=Verwendung: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] Dateien...\nOptionen:\n -c Neues Archiv erstellen\n -t Inhaltsverzeichnis f\u00FCr Archiv auflisten\n -x Genannte (oder alle) Dateien aus Archiv extrahieren\n -u Vorhandenes Archiv aktualisieren\n -v Verbose-Ausgabe f\u00FCr Standardausgabe generieren\n -f Namen der Archivdatei angeben\n -m Manifest-Informationen von angegebener Manifest-Datei einschlie\u00DFen\n -e Anwendungs-Einstiegspunkt f\u00FCr die \n in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelte Standalone-Anwendung angeben\n -0 Nur speichern (keine ZIP-Komprimierung)\n -M Keine Manifest-Datei f\u00FCr die Eintr\u00E4ge erstellen\n -i Indexinformationen f\u00FCr angegebenen JAR-Dateien erstellen\n -C zum angegebenen Verzeichnis wechseln und folgende Datei einschlie\u00DFen\nFalls eine Datei ein Verzeichnis ist, wird dieses rekursiv verarbeitet.\nDer Name der Manifest-Datei, der Name der Archivdatei und der Name des Einstiegspunkts werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Archivieren Sie zwei Klassendateien in ein Archiv mit Namen "classes.jar": \n jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Verwenden Sie die vorhandenen Manifest-Datei "mymanifest", und archivieren Sie\n alle Dateien im Verzeichnis foo/ in "classes.jar": \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(almacenado 0%)
out.create=\ creado: {0}
@@ -53499,7 +41253,7 @@
-usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n -c crear nuevo archivo\n -t crear la tabla de contenido del archivo\n -x extraer el archive mencionado (o todos) del archivo\n -u actualizar archive existente\n -v generar salida detallada de los datos de salida est\u00E1ndar\n -f especificar nombre de archive de almacenamiento\n -m incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n -e especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n que se incluye dentro de un archive jar ejecutable\n -0 s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n -M no crear un archive de manifiesto para las entradas\n -i generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n -C cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n archivos del directorio foo/ en 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n -c crear nuevo archivo\n -t crear la tabla de contenido del archivo\n -x extraer el archive mencionado (o todos) del archivo\n -u actualizar archive existente\n -v generar salida detallada de los datos de salida est\u00E1ndar\n -f especificar nombre de archive de almacenamiento\n -m incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n -e especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n que se incluye dentro de un archive jar ejecutable\n -0 s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n -M no crear un archive de manifiesto para las entradas\n -i generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n -C cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n archivos del directorio foo/ en 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(stockage : 0 %)
out.create=\ cr\u00E9\u00E9 : {0}
@@ -53510,7 +41264,7 @@
usage=Syntaxe : jar {ctxui}[vfm0Me] [fichier-jar] [fichier-manifeste] [point-entr\u00E9e] [-C r\u00E9p] fichiers...\nOptions :\n -c cr\u00E9e une archive\n -t affiche la table des mati\u00E8res de l'archive\n -x extrait les fichiers nomm\u00E9s (ou tous les fichiers) de l'archive\n -u met \u00E0 jour l'archive existante\n -v g\u00E9n\u00E8re une version d\u00E9taill\u00E9e d'une sortie standard\n -f sp\u00E9cifie le nom du fichier archive\n -m inclut les informations de manifeste \u00E0 partir du fichier de manifeste sp\u00E9cifi\u00E9\n -e sp\u00E9cifie le point d'entr\u00E9e d'une application en mode autonome \n int\u00E9gr\u00E9e \u00E0 un fichier JAR ex\u00E9cutable\n -0 stockage uniquement, pas de compression ZIP\n -M ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es\n -i g\u00E9n\u00E8re les informations d'index des fichiers JAR sp\u00E9cifi\u00E9s\n -C passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le fichier suivant\nSi l'un des fichiers est un r\u00E9pertoire, celui-ci est trait\u00E9 r\u00E9cursivement.\nLes noms du fichier manifeste, du fichier archive et du point d'entr\u00E9e sont\nsp\u00E9cifi\u00E9s dans le m\u00EAme ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitul\u00E9e classes.jar : \n jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'monmanifeste', puis archiver tous les\n fichiers du r\u00E9pertoire foo/ dans 'classes.jar' : \n jar cvfm classes.jar monmanifeste -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(memorizzato 0%)
out.create=\ creato: {0}
@@ -53522,7 +41276,7 @@
-usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n -c crea un nuovo archivio\n -t visualizza l'indice dell'archivio\n -x estrae i file con nome (o tutti i file) dall'archivio\n -u aggiorna l'archivio esistente\n -v genera output commentato dall'output standard\n -f specifica il nome file dell'archivio\n -m include informazioni manifest dal file manifest specificato\n -e specifica il punto di ingresso per l'applicazione stand-alone \n inclusa nel file jar eseguibile\n -0 solo memorizzazione; senza compressione ZIP\n -M consente di non creare un file manifest per le voci\n -i genera informazioni sull'indice per i file jar specificati\n -C imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n file della directory foo/ in 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/.\n
+usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n -c crea un nuovo archivio\n -t visualizza l'indice dell'archivio\n -x estrae i file con nome (o tutti i file) dall'archivio\n -u aggiorna l'archivio esistente\n -v genera output commentato dall'output standard\n -f specifica il nome file dell'archivio\n -m include informazioni manifest dal file manifest specificato\n -e specifica il punto di ingresso per l'applicazione stand-alone \n inclusa nel file jar eseguibile\n -0 solo memorizzazione; senza compressione ZIP\n -M consente di non creare un file manifest per le voci\n -i genera informazioni sull'indice per i file jar specificati\n -C imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n file della directory foo/ in 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(0%\u683C\u7D0D\u3055\u308C\u307E\u3057\u305F)
out.create=\ {0}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
@@ -53534,7 +41288,7 @@
-usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n jar cvfm classes.jar mymanifest -C foo/ \n
+usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2014-04-20 12:39:21.000000000 -0700
@@ -34,14 +34,14 @@
error.create.dir={0}: \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
error.incorrect.length=\uCC98\uB9AC \uC911 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAE38\uC774\uAC00 \uBC1C\uACAC\uB428: {0}
@@ -53554,7 +41308,7 @@
-usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n -c \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -t \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n -x \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n -u \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uAC31\uC2E0\uD569\uB2C8\uB2E4.\n -v \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -f \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -m \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n -e jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -0 \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -M \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -i \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -C \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n -c \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -t \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n -x \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n -u \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n -v \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -f \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -m \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n -e jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -0 \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -M \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -i \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -C \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2014-04-20 12:39:21.000000000 -0700
@@ -37,11 +37,11 @@
out.update.manifest=manifesto atualizado
out.ignore.entry=ignorando entrada {0}
@@ -53571,7 +41325,7 @@
usage=Uso: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] arquivos ...\nOp\u00E7\u00F5es:\n -c cria novo arquivo compactado\n -t lista o sum\u00E1rio do arquivo compactado\n -x extrai arquivos com o nome (ou todos) do arquivo compactado\n -u atualizar o arquivo compactado existente\n -v gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n -f especifica o nome do arquivo do arquivo compactado\n -m inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n -e especifica o ponto de entrada da aplica\u00E7\u00E3o para aplica\u00E7\u00E3o independente \n empacotando em um arquivo jar execut\u00E1vel\n -0 armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n -M n\u00E3o cria um arquivo de manifesto para as entradas\n -i gera informa\u00E7\u00F5es de \u00EDndice para os arquivos especificados\n -C altera para o diret\u00F3rio e inclui o arquivo seguinte\nSe nenhum arquivo for um diret\u00F3rio, ent\u00E3o ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado com o nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n arquivos no diret\u00F3rio foo/ na 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2014-04-20 12:39:21.000000000 -0700
@@ -44,4 +44,4 @@
out.inflated=\ uppackat: {0}
out.size=(in = {0}) (ut = {1})
@@ -53579,7 +41333,7 @@
-usage=Syntax: jar {ctxui}[vfm0Me] [jar fil] [manifestfil] [startpunkt] [-C-katalog] ...\nAlternativ:\n -c skapa nytt arkiv\n -t lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n -x extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n -u uppdatera befintligt arkiv\n -v generera utf\u00F6rliga utdata vid standardutmatning\n -f ange arkivfilens namn\n -m inkludera manifestinformation fr\u00E5n angivet manifest\n -e ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n som medf\u00F6ljer i en jar-programfil\n -0 endast lagra (ingen zip-komprimering)\n -M skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n -i generera indexinformation f\u00F6r de angivna jar-filerna\n -C \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n filer fr\u00E5n katalogen foo/ i classes.jar: \n jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Syntax: jar {ctxui}[vfm0Me] [jar-fil] [manifestfil] [startpunkt] [-C katalog] filer...\nAlternativ:\n -c skapa nytt arkiv\n -t lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n -x extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n -u uppdatera befintligt arkiv\n -v generera utf\u00F6rliga utdata vid standardutmatning\n -f ange arkivfilens namn\n -m inkludera manifestinformation fr\u00E5n angivet manifest\n -e ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n som medf\u00F6ljer i en jar-programfil\n -0 endast lagra (ingen zip-komprimering)\n -M skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n -i generera indexinformation f\u00F6r de angivna jar-filerna\n -C \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n filer fr\u00E5n katalogen foo/ i classes.jar: \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2014-04-20 12:39:21.000000000 -0700
@@ -44,4 +44,4 @@
out.inflated=\ \u5DF2\u89E3\u538B: {0}
out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1})
@@ -53587,7 +41341,7 @@
-usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n -c \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n -t \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n -x \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n -u \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n -v \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n -f \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n -m \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n -e \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n -0 \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n -M \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n -i \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n -C \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/\u3002\n
+usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n -c \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n -t \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n -x \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n -u \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n -v \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n -f \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n -m \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n -e \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n -0 \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n -M \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n -i \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n -C \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2013-09-06 11:28:49.000000000 -0700
-+++ jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2014-04-20 12:39:21.000000000 -0700
@@ -41,7 +41,7 @@
out.stored=(\u5132\u5B58 0%)
out.create=\ \u5EFA\u7ACB: {0}
@@ -53598,7 +41352,14 @@
usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] \u6A94\u6848 ...\n\u9078\u9805:\n -c \u5EFA\u7ACB\u65B0\u7684\u6B78\u6A94\n -t \u5217\u51FA\u6B78\u6A94\u7684\u76EE\u9304\n -x \u5F9E\u6B78\u6A94\u4E2D\u64F7\u53D6\u5DF2\u547D\u540D\u7684 (\u6216\u6240\u6709) \u6A94\u6848\n -u \u66F4\u65B0\u73FE\u6709\u6B78\u6A94\n -v \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA\n -f \u6307\u5B9A\u6B78\u6A94\u6A94\u6848\u540D\u7A31\n -m \u5305\u542B\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\u8CC7\u8A0A\n -e \u70BA\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F\u6307\u5B9A\u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE\n \u5DF2\u96A8\u9644\u65BC\u53EF\u57F7\u884C jar \u6A94\u6848\u4E2D\n -0 \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F\n -M \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\n -i \u70BA\u6307\u5B9A\u7684 jar \u6A94\u6848\u7522\u751F\u7D22\u5F15\u8CC7\u8A0A\n -C \u8B8A\u66F4\u81F3\u6307\u5B9A\u76EE\u9304\u4E26\u5305\u542B\u5F8C\u9762\u6240\u5217\u7684\u6A94\u6848\n\u5982\u679C\u6709\u4EFB\u4F55\u6A94\u6848\u662F\u76EE\u9304\uFF0C\u5247\u6703\u5C0D\u5176\u9032\u884C\u905E\u8FF4\u8655\u7406\u3002\n\u6E05\u55AE\u6A94\u6848\u540D\u7A31\u3001\u6B78\u6A94\u6A94\u6848\u540D\u7A31\u548C\u9032\u5165\u9EDE\u540D\u7A31\n\u7684\u6307\u5B9A\u9806\u5E8F\u8207\u6307\u5B9A 'm' \u65D7\u6A19\u3001'f' \u65D7\u6A19\u548C 'e' \u65D7\u6A19\u7684\u9806\u5E8F\u76F8\u540C\u3002\n\n\u7BC4\u4F8B 1: \u5C07\u5169\u500B\u985E\u5225\u6A94\u6848\u6B78\u6A94\u81F3\u540D\u70BA classes.jar \u7684\u6B78\u6A94\u4E2D: \n jar cvf classes.jar Foo.class Bar.class\n\u7BC4\u4F8B 2: \u4F7F\u7528\u73FE\u6709\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848 'mymanifest' \u4E26\u5C07\n foo/ \u76EE\u9304\u4E2D\u7684\u6240\u6709\u6A94\u6848\u6B78\u6A94\u81F3 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/ .\n
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@
"Chamorro Daylight Time", "ChDT"};
String CHUT[] = new String[] {"Chuuk Time", "CHUT",
@@ -53662,15 +41423,6 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Alma-Ata Time", "ALMT",
- "Alma-Ata Summer Time", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Anadyr Time", "ANAT",
- "Anadyr Summer Time", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Aqtau Time", "AQTT",
@@ -527,7 +527,7 @@
"Irkutsk Summer Time", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -53719,7 +41471,14 @@
"Middle Europe Summer Time", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre Normalzeit", "ACT",
@@ -53892,15 +41651,6 @@
{"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
"Mawson Sommerzeit", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Alma Ata Zeit", "ALMT",
- "Alma-Ata Sommerzeit", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Anadyr Zeit", "ANAT",
- "Anadyr Sommerzeit", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Aqtau Zeit", "AQTT",
@@ -527,7 +527,7 @@
"Irkutsk Sommerzeit", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -53949,7 +41699,14 @@
"Zentraleurop\u00e4ische Sommerzeit", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Hora de Acre", "ACT",
@@ -54079,15 +41836,6 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Hora de Alma-Ata", "ALMT",
- "Hora de verano de Alma-Ata", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT",
- "Hora de verano de Anadyr", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT",
@@ -527,7 +527,7 @@
"Hora de verano de Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -54147,7 +41895,14 @@
"Hora de verano de Europa Central", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
String ACT[] = new String[] {"Heure de l'Acre", "ACT",
"Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
@@ -54313,15 +42068,6 @@
{"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
"Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Heure d'Alma-Ata", "ALMT",
- "Heure d'\u00e9t\u00e9 d'Alma-Ata", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Heure d'Anadyr", "ANAT",
- "Heure d'\u00e9t\u00e9 d'Anadyr", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Heure d'Aqtau", "AQTT",
@@ -527,7 +527,7 @@
"Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -54379,7 +42125,14 @@
"Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Ora di Acre", "ACT",
@@ -54549,15 +42302,6 @@
{"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
"Ora estiva di Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Ora di Alma-Ata", "ALMT",
- "Ora estiva di Alma-Ata", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Ora di Anadyr", "ANAT",
- "Ora estiva di Anadyr", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Ora di Aqtau", "AQTT",
@@ -527,7 +527,7 @@
"Ora estiva di Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -54617,7 +42361,14 @@
"Ora estiva dell'Europa centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
@@ -54797,15 +42548,6 @@
{"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
"\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"\u30a2\u30eb\u30de\u30a2\u30bf\u6642\u9593", "ALMT",
- "\u30a2\u30eb\u30de\u30a2\u30bf\u590f\u6642\u9593", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u6642\u9593", "ANAT",
- "\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u590f\u6642\u9593", "ANAST"}},
- {"Asia/Aqtau", new String[] {"\u30a2\u30af\u30bf\u30a6\u6642\u9593", "AQTT",
@@ -527,7 +527,7 @@
"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -54865,7 +42607,14 @@
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
@@ -55045,15 +42794,6 @@
{"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
"\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"\uc54c\ub9c8\uc544\ud0c0 \uc2dc\uac04", "ALMT",
- "\uc54c\ub9c8\uc544\ud0c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"\uc544\ub098\ub514\ub974 \uc2dc\uac04", "ANAT",
- "\uc544\ub098\ub514\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ANAST"}},
- {"Asia/Aqtau", new String[] {"\uc545\ud0c0\uc6b0 \uc2dc\uac04", "AQTT",
@@ -527,7 +527,7 @@
"\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -55113,7 +42853,14 @@
"\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
@@ -55294,15 +43041,6 @@
{"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT",
"Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT",
- "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT",
- "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT",
@@ -527,7 +527,7 @@
"Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -55362,7 +43100,14 @@
"Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre, normaltid", "ACT",
@@ -55540,15 +43285,6 @@
{"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
"Mawson, sommartid", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Alma-Ata, normaltid", "ALMT",
- "Alma-Ata, sommartid", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"Anadyr, normaltid", "ANAT",
- "Anadyr, sommartid", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Aqtau, normaltid", "AQTT",
@@ -527,7 +527,7 @@
"Irkutsk, sommartid", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -55608,7 +43344,14 @@
"Mellaneuropeisk sommartid", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
@@ -55788,15 +43531,6 @@
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Alma-Ata \u65f6\u95f4", "ALMT",
- "Alma-Ata \u590f\u4ee4\u65f6", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u65f6\u95f4", "ANAT",
- "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u65f6", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Aqtau \u65f6\u95f4", "AQTT",
@@ -527,7 +527,7 @@
"\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -55856,7 +43590,14 @@
"\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2013-09-06 11:28:53.000000000 -0700
-+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2014-04-20 12:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
@@ -56036,15 +43777,6 @@
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -483,7 +483,7 @@
- {"Asia/Aden", ARAST},
- {"Asia/Almaty", new String[] {"Alma-Ata \u6642\u9593", "ALMT",
- "Alma-Ata \u590f\u4ee4\u6642\u9593", "ALMST"}},
-- {"Asia/Amman", EET},
-+ {"Asia/Amman", ARAST},
- {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u6642\u9593", "ANAT",
- "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u6642\u9593", "ANAST"}},
- {"Asia/Aqtau", new String[] {"Aqtau \u6642\u9593", "AQTT",
@@ -527,7 +527,7 @@
"Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
{"Asia/Istanbul", EET},
@@ -56104,7 +43836,7 @@
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},
--- jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2013-09-06 11:28:55.000000000 -0700
-+++ jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2014-04-20 12:39:18.000000000 -0700
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
# gnumake JDK=<java_home> OSNAME=linux [OPT=true]
@@ -56144,7 +43876,7 @@
CFLAGS += -I.
CFLAGS += -I../agent_util
--- jdk/src/share/demo/jvmti/hprof/hprof_class.c 2013-09-06 11:28:55.000000000 -0700
-+++ jdk/src/share/demo/jvmti/hprof/hprof_class.c 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/demo/jvmti/hprof/hprof_class.c 2014-04-20 12:39:17.000000000 -0700
@@ -527,7 +527,12 @@
jmethodID method;
@@ -56174,7 +43906,7 @@
HPROF_ASSERT(sig!=NULL);
clazz = class_get_class(env, index);
--- jdk/src/share/demo/jvmti/hprof/hprof_event.c 2013-09-06 11:28:55.000000000 -0700
-+++ jdk/src/share/demo/jvmti/hprof/hprof_event.c 2013-12-01 11:14:27.000000000 -0800
++++ jdk/src/share/demo/jvmti/hprof/hprof_event.c 2014-04-20 12:39:17.000000000 -0700
@@ -195,7 +195,12 @@
HPROF_ASSERT(env!=NULL);
@@ -56231,7 +43963,7 @@
}
}
--- jdk/src/share/lib/security/java.policy 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/lib/security/java.policy 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/lib/security/java.policy 2014-04-20 12:39:18.000000000 -0700
@@ -2,48 +2,51 @@
// Standard extensions get all permissions by default
@@ -56320,7 +44052,7 @@
};
--- jdk/src/share/lib/security/java.security-linux 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/lib/security/java.security-linux 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/lib/security/java.security-linux 2014-04-20 12:39:18.000000000 -0700
@@ -128,7 +128,10 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
@@ -56349,7 +44081,7 @@
# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
-
--- jdk/src/share/lib/security/java.security-macosx 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/lib/security/java.security-macosx 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/lib/security/java.security-macosx 2014-04-20 12:39:18.000000000 -0700
@@ -129,7 +129,10 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
@@ -56378,7 +44110,7 @@
# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
-
--- jdk/src/share/lib/security/java.security-solaris 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/lib/security/java.security-solaris 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/lib/security/java.security-solaris 2014-04-20 12:39:18.000000000 -0700
@@ -130,7 +130,10 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
@@ -56407,7 +44139,7 @@
# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
-i
--- jdk/src/share/lib/security/java.security-windows 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/lib/security/java.security-windows 2014-01-18 12:16:29.000000000 -0800
++++ jdk/src/share/lib/security/java.security-windows 2014-04-20 12:39:18.000000000 -0700
@@ -129,7 +129,10 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
@@ -56435,8 +44167,58 @@
# Example:
# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
-
+--- jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp 2013-09-06 11:28:57.000000000 -0700
++++ jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -4780,39 +4780,7 @@
+ } else if (log_file[0] != '\0' && (errstrm = fopen(log_file,"a+")) != NULL) {
+ return;
+ } else {
+- char log_file_name[PATH_MAX+100];
+- char tmpdir[PATH_MAX];
+-#ifdef WIN32
+- int n = GetTempPath(PATH_MAX,tmpdir); //API returns with trailing '\'
+- if (n < 1 || n > PATH_MAX) {
+- sprintf(tmpdir,"C:\\");
+- }
+- sprintf(log_file_name, "%sunpack.log", tmpdir);
+-#else
+- sprintf(tmpdir,"/tmp");
+- sprintf(log_file_name, "/tmp/unpack.log");
+-#endif
+- if ((errstrm = fopen(log_file_name, "a+")) != NULL) {
+- log_file = errstrm_name = saveStr(log_file_name);
+- return ;
+- }
+-
+- char *tname = tempnam(tmpdir,"#upkg");
+- if (tname == NULL) return;
+- sprintf(log_file_name, "%s", tname);
+- ::free(tname);
+- if ((errstrm = fopen(log_file_name, "a+")) != NULL) {
+- log_file = errstrm_name = saveStr(log_file_name);
+- return ;
+- }
+-#ifndef WIN32
+- sprintf(log_file_name, "/dev/null");
+- // On windows most likely it will fail.
+- if ( (errstrm = fopen(log_file_name, "a+")) != NULL) {
+- log_file = errstrm_name = saveStr(log_file_name);
+- return ;
+- }
+-#endif
++ fprintf(stderr, "Can not open log file %s\n", log_file);
+ // Last resort
+ // (Do not use stdout, since it might be jarout->jarfp.)
+ errstrm = stderr;
--- jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2013-09-06 11:28:57.000000000 -0700
-+++ jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -56465,7 +44247,7 @@
zs.next_in = (uchar*)head.ptr;
--- jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-04-20 12:39:16.000000000 -0700
@@ -64,7 +64,7 @@
@@ -56476,7 +44258,7 @@
#endif
--- jdk/src/share/native/java/lang/Class.c 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/java/lang/Class.c 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/native/java/lang/Class.c 2014-04-20 12:39:16.000000000 -0700
@@ -70,7 +70,7 @@
{"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain},
{"setProtectionDomain0", "(" PD ")V", (void *)&JVM_SetProtectionDomain},
@@ -56487,7 +44269,7 @@
{"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations},
{"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},
--- jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2014-04-20 12:39:16.000000000 -0700
@@ -24,6 +24,9 @@
* questions.
*/
@@ -56512,7 +44294,7 @@
#if defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(arm) || \
--- jdk/src/share/native/java/net/Inet6Address.c 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/java/net/Inet6Address.c 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/native/java/net/Inet6Address.c 2014-04-20 12:39:16.000000000 -0700
@@ -33,6 +33,8 @@
*/
@@ -56555,7 +44337,7 @@
ia6_ctrID = (*env)->GetMethodID(env, ia6_class, "<init>", "()V");
CHECK_NULL(ia6_ctrID);
--- jdk/src/share/native/java/net/net_util.c 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/java/net/net_util.c 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/native/java/net/net_util.c 2014-04-20 12:39:16.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -56718,7 +44500,7 @@
return JNI_TRUE;
} else {
--- jdk/src/share/native/java/net/net_util.h 2013-09-06 11:28:58.000000000 -0700
-+++ jdk/src/share/native/java/net/net_util.h 2013-12-01 11:14:28.000000000 -0800
++++ jdk/src/share/native/java/net/net_util.h 2014-04-20 12:39:16.000000000 -0700
@@ -58,6 +58,22 @@
extern jfieldID iac_hostNameID;
extern jfieldID ia_preferIPv6AddressID;
@@ -56750,8 +44532,21 @@
extern jfieldID ia6_ipaddressID;
extern jfieldID ia6_scopeidID;
extern jfieldID ia6_cachedscopeidID;
+--- jdk/src/share/native/sun/awt/giflib/dgif_lib.c 2013-09-06 11:28:59.000000000 -0700
++++ jdk/src/share/native/sun/awt/giflib/dgif_lib.c 2014-04-20 12:39:16.000000000 -0700
+@@ -435,9 +435,7 @@
+ Private->PixelCount = (long)GifFile->Image.Width *
+ (long)GifFile->Image.Height;
+
+- DGifSetupDecompress(GifFile); /* Reset decompress algorithm parameters. */
+-
+- return GIF_OK;
++ return DGifSetupDecompress(GifFile); /* Reset decompress algorithm parameters. */
+ }
+
+ /******************************************************************************
--- jdk/src/share/native/sun/awt/image/awt_parseImage.c 2013-09-06 11:28:59.000000000 -0700
-+++ jdk/src/share/native/sun/awt/image/awt_parseImage.c 2013-12-01 11:14:29.000000000 -0800
++++ jdk/src/share/native/sun/awt/image/awt_parseImage.c 2014-04-20 12:39:16.000000000 -0700
@@ -808,363 +808,204 @@
return 1;
}
@@ -57243,7 +45038,7 @@
+ return 1;
}
--- jdk/src/share/native/sun/awt/image/awt_parseImage.h 2013-09-06 11:28:59.000000000 -0700
-+++ jdk/src/share/native/sun/awt/image/awt_parseImage.h 2013-12-01 11:14:29.000000000 -0800
++++ jdk/src/share/native/sun/awt/image/awt_parseImage.h 2014-04-20 12:39:16.000000000 -0700
@@ -188,13 +188,8 @@
void awt_freeParsedImage(BufImageS_t *imageP, int freeImageP);
@@ -57261,9 +45056,19 @@
+int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
#endif /* AWT_PARSE_IMAGE_H */
+--- jdk/src/share/native/sun/awt/image/gif/gifdecoder.c 2013-09-06 11:28:59.000000000 -0700
++++ jdk/src/share/native/sun/awt/image/gif/gifdecoder.c 2014-04-20 12:39:16.000000000 -0700
+@@ -249,6 +249,7 @@
+ /* fill the block */
+ len = (*env)->CallIntMethod(env, this, readID,
+ blockh, remain, blockLength + 1);
++ if (len > blockLength + 1) len = blockLength + 1;
+ if ((*env)->ExceptionOccurred(env)) {
+ return 0;
+ }
--- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-09-06 11:28:59.000000000 -0700
-+++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-12-01 11:14:29.000000000 -0800
-@@ -930,9 +930,10 @@
++++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-04-20 12:39:16.000000000 -0700
+@@ -930,14 +930,18 @@
* Now fill a complete buffer, or as much of one as the stream
* will give us if we are near the end.
*/
@@ -57275,7 +45080,15 @@
ret = (*env)->CallIntMethod(env,
input,
JPEGImageReader_readInputDataID,
-@@ -1017,9 +1018,11 @@
+ sb->hstreamBuffer, 0,
+ sb->bufferLength);
++ if ((ret > 0) && ((unsigned int)ret > sb->bufferLength)) {
++ ret = sb->bufferLength;
++ }
+ if ((*env)->ExceptionOccurred(env)
+ || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
+ cinfo->err->error_exit((j_common_ptr) cinfo);
+@@ -1017,9 +1021,11 @@
memcpy(sb->buf, src->next_input_byte, offset);
}
@@ -57288,7 +45101,15 @@
buflen = sb->bufferLength - offset;
if (buflen <= 0) {
if (!GET_ARRAYS(env, data, &(src->next_input_byte))) {
-@@ -1121,9 +1124,10 @@
+@@ -1032,6 +1038,7 @@
+ JPEGImageReader_readInputDataID,
+ sb->hstreamBuffer,
+ offset, buflen);
++ if ((ret > 0) && ((unsigned int)ret > buflen)) ret = buflen;
+ if ((*env)->ExceptionOccurred(env)
+ || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
+ cinfo->err->error_exit((j_common_ptr) cinfo);
+@@ -1121,9 +1128,10 @@
return;
}
@@ -57300,7 +45121,7 @@
ret = (*env)->CallLongMethod(env,
input,
JPEGImageReader_skipInputBytesID,
-@@ -2306,10 +2310,10 @@
+@@ -2306,10 +2314,10 @@
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jobject output = NULL;
@@ -57313,7 +45134,7 @@
(*env)->CallVoidMethod(env,
output,
JPEGImageWriter_writeOutputDataID,
-@@ -2348,10 +2352,10 @@
+@@ -2348,10 +2356,10 @@
if (datacount != 0) {
jobject output = NULL;
@@ -57326,7 +45147,7 @@
(*env)->CallVoidMethod(env,
output,
JPEGImageWriter_writeOutputDataID,
-@@ -2702,6 +2706,15 @@
+@@ -2702,6 +2710,15 @@
bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
for (i = 0; i < numBands; i++) {
@@ -57342,9 +45163,132 @@
if (bandSize[i] != JPEG_BAND_SIZE) {
if (scale == NULL) {
scale = (UINT8**) calloc(numBands, sizeof(UINT8*));
+--- jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2013-09-06 11:28:59.000000000 -0700
++++ jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2014-04-20 12:39:16.000000000 -0700
+@@ -349,6 +349,12 @@
+
+ TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+ compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++ /* This CSi (cc) should differ from the previous CSi */
++ for (ci = 0; ci < i; ci++) {
++ if (cinfo->cur_comp_info[ci] == compptr)
++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++ }
+ }
+
+ /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+--- jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-09-06 11:29:00.000000000 -0700
++++ jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2014-04-20 12:39:16.000000000 -0700
+@@ -289,6 +289,7 @@
+ buflen = (*env)->GetArrayLength(env, src->hInputBuffer);
+ ret = (*env)->CallIntMethod(env, src->hInputStream, InputStream_readID,
+ src->hInputBuffer, 0, buflen);
++ if (ret > buflen) ret = buflen;
+ if ((*env)->ExceptionOccurred(env) || !GET_ARRAYS(env, src)) {
+ cinfo->err->error_exit((struct jpeg_common_struct *) cinfo);
+ }
+@@ -349,6 +350,7 @@
+ }
+ ret = (*env)->CallIntMethod(env, src->hInputStream, InputStream_readID,
+ src->hInputBuffer, offset, buflen);
++ if ((ret > 0) && ((unsigned int)ret > buflen)) ret = buflen;
+ if ((*env)->ExceptionOccurred(env) || !GET_ARRAYS(env, src)) {
+ cinfo->err->error_exit((struct jpeg_common_struct *) cinfo);
+ }
+@@ -424,6 +426,7 @@
+ ret = (*env)->CallIntMethod(env, src->hInputStream,
+ InputStream_readID,
+ src->hInputBuffer, 0, buflen);
++ if (ret > buflen) ret = buflen;
+ if ((*env)->ExceptionOccurred(env)) {
+ cinfo->err->error_exit((struct jpeg_common_struct *) cinfo);
+ }
+--- jdk/src/share/native/sun/awt/libpng/pngrtran.c 2013-09-06 11:29:00.000000000 -0700
++++ jdk/src/share/native/sun/awt/libpng/pngrtran.c 2014-04-20 12:39:16.000000000 -0700
+@@ -1862,6 +1862,9 @@
+
+ info_ptr->bit_depth = 8;
+ info_ptr->num_trans = 0;
++
++ if (png_ptr->palette == NULL)
++ png_error (png_ptr, "Palette is NULL in indexed image");
+ }
+ else
+ {
+--- jdk/src/share/native/sun/awt/libpng/pngset.c 2013-09-06 11:29:00.000000000 -0700
++++ jdk/src/share/native/sun/awt/libpng/pngset.c 2014-04-20 12:39:16.000000000 -0700
+@@ -512,6 +512,17 @@
+ }
+ }
+
++ if ((num_palette > 0 && palette == NULL) ||
++ (num_palette == 0
++# ifdef PNG_MNG_FEATURES_SUPPORTED
++ && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0
++# endif
++ ))
++ {
++ png_error(png_ptr, "Invalid palette");
++ return;
++ }
++
+ /* It may not actually be necessary to set png_ptr->palette here;
+ * we do it for backward compatibility with the way the png_handle_tRNS
+ * function used to do the allocation.
--- jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2013-12-01 11:14:29.000000000 -0800
-@@ -700,22 +700,7 @@
++++ jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2014-04-20 12:39:16.000000000 -0700
+@@ -228,6 +228,49 @@
+ }
+ }
+
++/*
++ * We have to make sure that awt_setPixels can be safely applied to the given pair of
++ * raster and mlib image.
++ *
++ * In particular, make sure that
++ * - dimension is the same
++ * - number of channels in mlib image corresponds to the number of bands in the raster
++ * - sample size in image and raster are the same.
++ *
++ * Returns:
++ * -1 to indicate failure,
++ * 1 to indicate success
++ */
++static int setPixelsFormMlibImage(JNIEnv *env, RasterS_t *rasterP, mlib_image* img) {
++ if (rasterP->width != img->width || rasterP->height != img->height) {
++ /* dimension does not match */
++ return -1;
++ }
++
++ if (rasterP->numBands != img->channels) {
++ /* number of bands does not match */
++ return -1;
++ }
++
++ switch (rasterP->dataType) {
++ case BYTE_DATA_TYPE:
++ if (img->type != MLIB_BYTE) {
++ return -1;
++ }
++ break;
++ case SHORT_DATA_TYPE:
++ if (img->type != MLIB_SHORT && img->type != MLIB_USHORT) {
++ return -1;
++ }
++ break;
++ default:
++ /* awt_setPixels does not support such rasters */
++ return -1;
++ }
++
++ return awt_setPixels(env, rasterP, mlib_ImageGetData(img));
++}
++
+ /***************************************************************************
+ * External Functions *
+ ***************************************************************************/
+@@ -700,21 +743,8 @@
/* Means that we couldn't write directly into the destination buffer */
if (ddata == NULL) {
@@ -57363,12 +45307,12 @@
- break;
- default:
- retStatus = 0;
-- }
-+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
++ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
+ }
}
- /* Release the pinned memory */
-@@ -1119,24 +1104,9 @@
+@@ -1119,24 +1149,9 @@
/* Means that we couldn't write directly into the destination buffer */
if (ddata == NULL) {
@@ -57390,11 +45334,51 @@
- default:
- retStatus = 0;
- }
-+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
+ }
+ }
+
+@@ -1462,6 +1477,14 @@
+ retStatus = 0;
+ }
+
++ /* Release the LUT */
++ for (i=0; i < lut_nbands; i++) {
++ (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray,
++ (jbyte *) jtable[i].table, JNI_ABORT);
++ }
++ free ((void *) jtable);
++ free ((void *) tbl);
++
+ /*
+ * Means that we couldn't write directly into
+ * the destination buffer
+@@ -1475,13 +1498,6 @@
}
}
-@@ -1704,21 +1674,7 @@
+- /* Release the LUT */
+- for (i=0; i < lut_nbands; i++) {
+- (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray,
+- (jbyte *) jtable[i].table, JNI_ABORT);
+- }
+- free ((void *) jtable);
+- free ((void *) tbl);
+
+ /* Release the pinned memory */
+ freeArray(env, srcImageP, src, sdata, dstImageP, dst, ddata);
+@@ -1699,34 +1715,22 @@
+ retStatus = 0;
+ }
+
++ /* Release the LUT */
++ for (i=0; i < lut_nbands; i++) {
++ (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray,
++ (jbyte *) jtable[i].table, JNI_ABORT);
++ }
++
+ /*
+ * Means that we couldn't write directly into
* the destination buffer
*/
if (ddata == NULL) {
@@ -57412,12 +45396,21 @@
- break;
- default:
- retStatus = 0;
-- }
-+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
++ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
+ }
}
- /* Release the LUT */
-@@ -2029,21 +1985,25 @@
+- /* Release the LUT */
+- for (i=0; i < lut_nbands; i++) {
+- (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray,
+- (jbyte *) jtable[i].table, JNI_ABORT);
+- }
+-
+ /* Release the pinned memory */
+ freeDataArray(env, srcRasterP->jdata, src, sdata,
+ dstRasterP->jdata, dst, ddata);
+@@ -2029,21 +2033,25 @@
return 0;
}
@@ -57449,7 +45442,7 @@
int nbytes = 0;
if (!SAFE_TO_MULT(numLines, scanLength)) {
-@@ -2052,42 +2012,70 @@
+@@ -2052,42 +2060,70 @@
nbytes = numLines * scanLength;
@@ -57536,7 +45529,7 @@
jpixels = (*env)->NewIntArray(env, nbytes);
if (JNU_IsNull(env, jpixels)) {
-@@ -2095,14 +2083,15 @@
+@@ -2095,14 +2131,15 @@
return -1;
}
@@ -57557,7 +45550,7 @@
return -1;
}
-@@ -2111,12 +2100,11 @@
+@@ -2111,12 +2148,11 @@
(*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels, 0);
@@ -57573,7 +45566,7 @@
return -1;
}
}
-@@ -2298,7 +2286,6 @@
+@@ -2298,7 +2334,6 @@
mlib_image **mlibImagePP, void **dataPP, int isSrc) {
void *dataP;
unsigned char *cDataP;
@@ -57581,7 +45574,7 @@
int dataType = BYTE_DATA_TYPE;
int width;
int height;
-@@ -2484,8 +2471,7 @@
+@@ -2484,8 +2519,7 @@
return -1;
}
if (isSrc) {
@@ -57591,7 +45584,7 @@
(*sMlibSysFns.deleteImageFP)(*mlibImagePP);
return -1;
}
-@@ -2499,8 +2485,7 @@
+@@ -2499,8 +2533,7 @@
return -1;
}
if (isSrc) {
@@ -57601,7 +45594,7 @@
(*sMlibSysFns.deleteImageFP)(*mlibImagePP);
return -1;
}
-@@ -2550,60 +2535,6 @@
+@@ -2550,60 +2583,6 @@
}
}
@@ -57662,18 +45655,18 @@
#define ERR_BAD_IMAGE_LAYOUT (-2)
#define CHECK_DST_ARRAY(start_offset, elements_per_scan, elements_per_pixel) \
-@@ -2709,8 +2640,7 @@
+@@ -2709,8 +2688,7 @@
}
}
else if (mlibImP->type == MLIB_SHORT) {
- return awt_setPixelShort(env, -1, rasterP,
- (unsigned short *) mlibImP->data);
-+ return awt_setPixels(env, rasterP, mlibImP->data);
++ return setPixelsFormMlibImage(env, rasterP, mlibImP);
}
}
else {
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2014-04-20 12:39:16.000000000 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -57714,7 +45707,7 @@
#endif /* _NO_LONGLONG */
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2014-04-20 12:39:16.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57755,7 +45748,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2014-04-20 12:39:16.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57796,7 +45789,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2014-04-20 12:39:16.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57837,7 +45830,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2014-04-20 12:39:16.000000000 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57878,7 +45871,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2014-04-20 12:39:16.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57919,7 +45912,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2014-04-20 12:39:16.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -57960,7 +45953,7 @@
/***************************************************************/
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2014-04-20 12:39:16.000000000 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -58181,7 +46174,7 @@
#else /* _LONGLONG */
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2014-04-20 12:39:16.000000000 -0700
@@ -168,7 +168,7 @@
}
@@ -58463,7 +46456,7 @@
dp[13] = t1;
dp[14] = t2;
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2014-04-20 12:39:16.000000000 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -58616,7 +46609,7 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
--- jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2014-04-20 12:39:16.000000000 -0700
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -58627,7 +46620,7 @@
#else
mlib_s32 int0, int1;
--- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2013-09-06 11:29:00.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2014-04-20 12:39:16.000000000 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -58727,7 +46720,7 @@
dp += SIZE;
sp += SIZE;
--- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2014-04-20 12:39:16.000000000 -0700
@@ -120,7 +120,7 @@
} \
}
@@ -59961,7 +47954,7 @@
dp[13] = t1;
dp[14] = t2;
--- jdk/src/share/native/sun/awt/medialib/mlib_image.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_image.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_image.h 2014-04-20 12:39:16.000000000 -0700
@@ -27,9 +27,21 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -59986,7 +47979,7 @@
#include <mlib_status.h>
#include <mlib_sys.h>
--- jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2014-04-20 12:39:16.000000000 -0700
@@ -26,7 +26,7 @@
#include <stdlib.h>
@@ -60009,7 +48002,7 @@
#else
return (void *) memalign(8, size);
--- jdk/src/share/native/sun/awt/medialib/mlib_types.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-04-20 12:39:16.000000000 -0700
@@ -59,7 +59,7 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -60020,7 +48013,7 @@
#include <stdint.h> /* for uintptr_t */
#elif defined(__linux__)
--- jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2014-04-20 12:39:16.000000000 -0700
@@ -111,8 +111,9 @@
int
SplashIsStillLooping(Splash * splash)
@@ -60092,7 +48085,7 @@
while (i < pSrcRect->numSamples &&
getRGBA(pSrc, pSrcRect->format) >= ALPHA_THRESHOLD) {
--- jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -55,7 +55,7 @@
(const AlternateSetTable *) ((char *) this + alternateSetTableOffset));
TTGlyphID alternate = SWAPW(alternateSetTable->alternateArray[0]);
@@ -60103,7 +48096,7 @@
}
--- jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -37,55 +37,54 @@
U_NAMESPACE_BEGIN
@@ -60207,7 +48200,7 @@
pixels.fY += adjy;
}
--- jdk/src/share/native/sun/font/layout/AnchorTables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/AnchorTables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/AnchorTables.h 2014-04-20 12:39:16.000000000 -0700
@@ -49,20 +49,23 @@
le_int16 xCoordinate;
le_int16 yCoordinate;
@@ -60248,7 +48241,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -51,7 +51,7 @@
U_NAMESPACE_BEGIN
@@ -60281,7 +48274,7 @@
}
--- jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -59,7 +59,8 @@
ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
{
@@ -60293,7 +48286,7 @@
le_int32 joiningType = joiningTypes->getGlyphClass(joiningTypes, c, success);
--- jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -60,7 +60,7 @@
LEUnicode *outChars, LEGlyphStorage &glyphStorage)
{
@@ -60304,7 +48297,7 @@
le_int32 *combiningClasses = LE_NEW_ARRAY(le_int32, charCount);
le_int32 *indices = LE_NEW_ARRAY(le_int32, charCount);
--- jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2014-04-20 12:39:16.000000000 -0700
@@ -43,6 +43,8 @@
* This filter is used by character-based GSUB processors. It
* accepts only those characters which the given font can display.
@@ -60324,7 +48317,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2014-04-20 12:39:16.000000000 -0700
@@ -49,6 +49,7 @@
le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
le_bool hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;
@@ -60341,8 +48334,18 @@
};
struct ClassDefFormat1Table : ClassDefinitionTable
+--- jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp 2013-09-06 11:29:01.000000000 -0700
++++ jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -154,6 +154,7 @@
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+ if ((glyphCode >= firstGlyph) && (glyphCode < lastGlyph)) {
+ LEReferenceToArrayOf<LookupValue> valueArray(lookupTable8, success, &lookupTable8->valueArray[0], glyphCount);
++ if (LE_FAILURE(success)) { return newGlyph; }
+ newGlyph = SWAPW(valueArray(glyphCode - firstGlyph, success));
+ }
+ }
--- jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -48,7 +48,7 @@
*/
void ContextualSubstitutionBase::applySubstitutionLookups(
@@ -60375,7 +48378,7 @@
GlyphIterator *glyphIterator, le_bool backtrack)
{
le_int32 direction = 1;
-@@ -101,9 +102,12 @@
+@@ -101,11 +102,16 @@
return TRUE;
}
@@ -60389,8 +48392,12 @@
+ LEErrorCode &success,
le_bool backtrack)
{
++ if (LE_FAILURE(success)) { return FALSE; }
++
le_int32 direction = 1;
-@@ -120,7 +124,7 @@
+ le_int32 match = 0;
+
+@@ -120,7 +126,7 @@
}
LEGlyphID glyph = glyphIterator->getCurrGlyphID();
@@ -60399,7 +48406,7 @@
le_int32 matchClass = SWAPW(classArray[match]);
if (glyphClass != matchClass) {
-@@ -128,7 +132,7 @@
+@@ -128,7 +134,7 @@
// in the class array which aren't in the class definition
// table. If we're looking for such a class, pretend that
// we found it.
@@ -60408,7 +48415,7 @@
return FALSE;
}
}
-@@ -140,8 +144,8 @@
+@@ -140,8 +146,8 @@
return TRUE;
}
@@ -60419,7 +48426,7 @@
{
le_int32 direction = 1;
le_int32 glyph = 0;
-@@ -153,13 +157,15 @@
+@@ -153,13 +159,15 @@
while (glyphCount > 0) {
Offset coverageTableOffset = SWAPW(coverageTableOffsetArray[glyph]);
@@ -60438,7 +48445,7 @@
return FALSE;
}
-@@ -170,7 +176,7 @@
+@@ -170,7 +178,7 @@
return TRUE;
}
@@ -60447,7 +48454,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -186,20 +192,29 @@
+@@ -186,20 +194,29 @@
case 1:
{
@@ -60483,7 +48490,7 @@
}
default:
-@@ -207,7 +222,7 @@
+@@ -207,7 +224,7 @@
}
}
@@ -60492,7 +48499,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -227,22 +242,22 @@
+@@ -227,22 +244,23 @@
if (coverageIndex < srSetCount) {
Offset subRuleSetTableOffset = SWAPW(subRuleSetTableOffsetArray[coverageIndex]);
@@ -60517,13 +48524,14 @@
- const SubstitutionLookupRecord *substLookupRecordArray =
- (const SubstitutionLookupRecord *) &subRuleTable->inputGlyphArray[matchCount];
+ LEReferenceToArrayOf<TTGlyphID> inputGlyphArray(base, success, subRuleTable->inputGlyphArray, matchCount+2);
++ if (LE_FAILURE(success)) { return 0; }
+ if (matchGlyphIDs(inputGlyphArray, matchCount, glyphIterator)) {
+ LEReferenceToArrayOf<SubstitutionLookupRecord>
+ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) &subRuleTable->inputGlyphArray[matchCount], substCount);
applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
-@@ -259,7 +274,8 @@
+@@ -259,7 +277,8 @@
return 0;
}
@@ -60533,7 +48541,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -275,29 +291,33 @@
+@@ -275,29 +294,34 @@
}
if (coverageIndex >= 0) {
@@ -60571,13 +48579,14 @@
- (const SubstitutionLookupRecord *) &subClassRuleTable->classArray[matchCount];
+ LEReferenceToArrayOf<le_uint16> classArray(base, success, subClassRuleTable->classArray, matchCount+1);
+
++ if (LE_FAILURE(success)) { return 0; }
+ if (matchGlyphClasses(classArray, matchCount, glyphIterator, classDefinitionTable, success)) {
+ LEReferenceToArrayOf<SubstitutionLookupRecord>
+ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) &subClassRuleTable->classArray[matchCount], substCount);
applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
-@@ -314,7 +334,8 @@
+@@ -314,7 +338,8 @@
return 0;
}
@@ -60587,7 +48596,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success)const
-@@ -333,9 +354,13 @@
+@@ -333,9 +358,13 @@
// that matched when we're done.
glyphIterator->prev();
@@ -60604,7 +48613,7 @@
ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, subCount, glyphIterator, fontInstance, position, success);
-@@ -347,7 +372,8 @@
+@@ -347,7 +376,8 @@
return 0;
}
@@ -60614,7 +48623,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -363,20 +389,23 @@
+@@ -363,20 +393,23 @@
case 1:
{
@@ -60644,7 +48653,7 @@
}
default:
-@@ -390,7 +419,7 @@
+@@ -390,7 +423,7 @@
// emptyFeatureList matches an le_uint32 or an le_uint16...
static const FeatureMask emptyFeatureList = 0x00000000UL;
@@ -60653,7 +48662,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -410,8 +439,8 @@
+@@ -410,8 +443,8 @@
if (coverageIndex < srSetCount) {
Offset chainSubRuleSetTableOffset = SWAPW(chainSubRuleSetTableOffsetArray[coverageIndex]);
@@ -60664,7 +48673,7 @@
le_uint16 chainSubRuleCount = SWAPW(chainSubRuleSetTable->chainSubRuleCount);
le_int32 position = glyphIterator->getCurrStreamPosition();
GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
-@@ -419,13 +448,19 @@
+@@ -419,13 +452,19 @@
for (le_uint16 subRule = 0; subRule < chainSubRuleCount; subRule += 1) {
Offset chainSubRuleTableOffset =
SWAPW(chainSubRuleSetTable->chainSubRuleTableOffsetArray[subRule]);
@@ -60688,7 +48697,7 @@
le_uint16 substCount = (le_uint16) SWAPW(lookaheadGlyphArray[lookaheadGlyphCount]);
tempIterator.setCurrStreamPosition(position);
-@@ -435,7 +470,8 @@
+@@ -435,7 +474,8 @@
}
tempIterator.prev();
@@ -60698,7 +48707,7 @@
continue;
}
-@@ -446,8 +482,8 @@
+@@ -446,8 +486,8 @@
}
if (matchGlyphIDs(inputGlyphArray, inputGlyphCount, glyphIterator)) {
@@ -60709,7 +48718,7 @@
applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
-@@ -464,7 +500,7 @@
+@@ -464,7 +504,7 @@
return 0;
}
@@ -60718,7 +48727,7 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode& success) const
-@@ -480,19 +516,21 @@
+@@ -480,19 +520,21 @@
}
if (coverageIndex >= 0) {
@@ -60749,7 +48758,7 @@
le_uint16 chainSubClassRuleCount = SWAPW(chainSubClassSetTable->chainSubClassRuleCount);
le_int32 position = glyphIterator->getCurrStreamPosition();
GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
-@@ -500,13 +538,15 @@
+@@ -500,13 +542,15 @@
for (le_uint16 scRule = 0; scRule < chainSubClassRuleCount; scRule += 1) {
Offset chainSubClassRuleTableOffset =
SWAPW(chainSubClassSetTable->chainSubClassRuleTableOffsetArray[scRule]);
@@ -60770,7 +48779,7 @@
le_uint16 substCount = SWAPW(lookaheadClassArray[lookaheadGlyphCount]);
-@@ -517,20 +557,22 @@
+@@ -517,21 +561,23 @@
}
tempIterator.prev();
@@ -60793,13 +48802,15 @@
- if (matchGlyphClasses(inputClassArray, inputGlyphCount, glyphIterator, inputClassDefinitionTable)) {
- const SubstitutionLookupRecord *substLookupRecordArray =
- (const SubstitutionLookupRecord *) &lookaheadClassArray[lookaheadGlyphCount + 1];
+-
+ if (matchGlyphClasses(inputClassArray, inputGlyphCount, glyphIterator, inputClassDefinitionTable, success)) {
+ LEReferenceToArrayOf<SubstitutionLookupRecord>
+ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) lookaheadClassArray.getAlias(lookaheadGlyphCount + 1, success), substCount);
-
++ if (LE_FAILURE(success)) { return 0; }
applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
-@@ -547,7 +589,7 @@
+ return inputGlyphCount + 1;
+@@ -547,7 +593,7 @@
return 0;
}
@@ -60808,12 +48819,13 @@
GlyphIterator *glyphIterator,
const LEFontInstance *fontInstance,
LEErrorCode & success) const
-@@ -558,9 +600,13 @@
+@@ -558,9 +604,14 @@
le_uint16 backtrkGlyphCount = SWAPW(backtrackGlyphCount);
le_uint16 inputGlyphCount = (le_uint16) SWAPW(backtrackCoverageTableOffsetArray[backtrkGlyphCount]);
- const Offset *inputCoverageTableOffsetArray = &backtrackCoverageTableOffsetArray[backtrkGlyphCount + 1];
+ LEReferenceToArrayOf<Offset> inputCoverageTableOffsetArray(base, success, &backtrackCoverageTableOffsetArray[backtrkGlyphCount + 1], inputGlyphCount+2); // offset
++ if (LE_FAILURE(success)) { return 0; }
const le_uint16 lookaheadGlyphCount = (le_uint16) SWAPW(inputCoverageTableOffsetArray[inputGlyphCount]);
- const Offset *lookaheadCoverageTableOffsetArray = &inputCoverageTableOffsetArray[inputGlyphCount + 1];
+
@@ -60824,7 +48836,7 @@
le_uint16 substCount = (le_uint16) SWAPW(lookaheadCoverageTableOffsetArray[lookaheadGlyphCount]);
le_int32 position = glyphIterator->getCurrStreamPosition();
GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
-@@ -571,14 +617,14 @@
+@@ -571,14 +622,14 @@
tempIterator.prev();
if (! ContextualSubstitutionBase::matchGlyphCoverages(backtrackCoverageTableOffsetArray,
@@ -60841,7 +48853,7 @@
return 0;
}
-@@ -589,9 +635,10 @@
+@@ -589,9 +640,10 @@
glyphIterator->prev();
if (ContextualSubstitutionBase::matchGlyphCoverages(inputCoverageTableOffsetArray,
@@ -60856,7 +48868,7 @@
ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
--- jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2014-04-20 12:39:16.000000000 -0700
@@ -56,20 +56,32 @@
struct ContextualSubstitutionBase : GlyphSubstitutionSubtable
{
@@ -60973,7 +48985,7 @@
LE_VAR_ARRAY(ChainingContextualSubstitutionFormat3Subtable, backtrackCoverageTableOffsetArray)
--- jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -37,8 +37,10 @@
U_NAMESPACE_BEGIN
@@ -61053,7 +49065,7 @@
}
--- jdk/src/share/native/sun/font/layout/CoverageTables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/CoverageTables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/CoverageTables.h 2014-04-20 12:39:16.000000000 -0700
@@ -46,7 +46,7 @@
{
le_uint16 coverageFormat;
@@ -61082,7 +49094,7 @@
LE_VAR_ARRAY(CoverageFormat2Table, rangeRecordArray)
--- jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -51,23 +51,27 @@
}
@@ -61117,7 +49129,7 @@
//glyphIterator->clearCursiveExitPoint();
}
--- jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -43,7 +43,7 @@
#define FORMAT_COUNT LE_ARRAY_SIZE(fieldBits)
@@ -61142,7 +49154,7 @@
le_uint16 fieldIndex = sizeIndex % count;
le_uint16 shift = 16 - (bits * (fieldIndex + 1));
--- jdk/src/share/native/sun/font/layout/DeviceTables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/DeviceTables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/DeviceTables.h 2014-04-20 12:39:16.000000000 -0700
@@ -50,7 +50,7 @@
le_uint16 deltaFormat;
le_uint16 deltaValues[ANY_NUMBER];
@@ -61153,7 +49165,7 @@
private:
static const le_uint16 fieldMasks[];
--- jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -48,7 +48,6 @@
const LookupProcessor *lookupProcessor, le_uint16 lookupType,
GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
@@ -61163,7 +49175,7 @@
return 0;
}
--- jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2014-04-20 12:39:16.000000000 -0700
@@ -52,8 +52,7 @@
le_uint16 extensionLookupType;
le_uint32 extensionOffset;
@@ -61175,7 +49187,7 @@
};
--- jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -49,9 +49,9 @@
// nothing to do?
}
@@ -61189,7 +49201,7 @@
return glyphClass == gcdMarkGlyph;
}
--- jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2014-04-20 12:39:16.000000000 -0700
@@ -55,7 +55,7 @@
GDEFMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
virtual ~GDEFMarkFilter();
@@ -61200,7 +49212,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -41,14 +41,13 @@
U_NAMESPACE_BEGIN
@@ -61349,7 +49361,7 @@
le_bool GlyphIterator::hasFeatureTag(le_bool matchGroup) const
--- jdk/src/share/native/sun/font/layout/GlyphIterator.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GlyphIterator.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GlyphIterator.h 2014-04-20 12:39:16.000000000 -0700
@@ -49,7 +49,7 @@
class GlyphIterator : public UMemory {
public:
@@ -61384,7 +49396,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -95,6 +95,8 @@
le_uint32 delta = 0;
@@ -61434,7 +49446,7 @@
}
--- jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -123,7 +123,7 @@
{
const LEReferenceTo<ContextualSubstitutionSubtable> subtable(lookupSubtable, success);
@@ -61454,7 +49466,7 @@
}
--- jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -44,7 +44,7 @@
#include "LEGlyphStorage.h"
@@ -61508,7 +49520,7 @@
}
--- jdk/src/share/native/sun/font/layout/KernTable.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/KernTable.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/KernTable.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -39,7 +39,7 @@
#include <stdio.h>
@@ -61577,7 +49589,7 @@
storage[i-1], storage[i], i, value & 0xffff, font->xUnitsToPoints(value));
fflush(stdout);
--- jdk/src/share/native/sun/font/layout/LEFontInstance.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEFontInstance.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEFontInstance.h 2014-04-20 12:39:16.000000000 -0700
@@ -181,6 +181,10 @@
*
* Subclasses which represent composite fonts should always return <code>NULL</code>.
@@ -61605,7 +49617,7 @@
-
-
--- jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2014-04-20 12:39:16.000000000 -0700
@@ -62,7 +62,7 @@
*
* @internal
@@ -61616,7 +49628,7 @@
#endif /* U_HIDE_INTERNAL_API */
--- jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -458,7 +458,7 @@
success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
return;
@@ -61632,14 +49644,14 @@
U_NAMESPACE_END
-
--- jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2014-04-20 12:39:16.000000000 -0700
@@ -568,4 +568,3 @@
U_NAMESPACE_END
#endif
-
--- jdk/src/share/native/sun/font/layout/LEScripts.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEScripts.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEScripts.h 2014-04-20 12:39:16.000000000 -0700
@@ -30,7 +30,7 @@
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING.
@@ -61668,7 +49680,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/LEStandalone.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LEStandalone.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LEStandalone.h 2014-04-20 12:39:16.000000000 -0700
@@ -132,6 +132,9 @@
#define uprv_memcpy memcpy
#define uprv_realloc realloc
@@ -61680,7 +49692,7 @@
#ifdef _LITTLE_ENDIAN
#define U_IS_BIG_ENDIAN 0
--- jdk/src/share/native/sun/font/layout/LETableReference.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LETableReference.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LETableReference.h 2014-04-20 12:39:16.000000000 -0700
@@ -38,34 +38,47 @@
#include "LETypes.h"
#include "LEFontInstance.h"
@@ -62122,7 +50134,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/LETypes.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LETypes.h 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LETypes.h 2014-04-20 12:39:16.000000000 -0700
@@ -337,6 +337,20 @@
typedef struct LEPoint LEPoint;
#endif
@@ -62183,7 +50195,7 @@
-#endif /* __LETYPES_H */
+#endif
--- jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -156,7 +156,7 @@
CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
virtual ~CanonMarkFilter();
@@ -62297,7 +50309,7 @@
break;
--- jdk/src/share/native/sun/font/layout/LayoutEngine.h 2013-09-06 11:29:01.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LayoutEngine.h 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LayoutEngine.h 2014-04-20 12:39:16.000000000 -0700
@@ -156,8 +156,8 @@
* @param fontInstance - the font for the text
* @param scriptCode - the script for the text
@@ -62309,8 +50321,37 @@
* @param success - set to an error code if the operation fails
*
* @see LEFontInstance
+--- jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -95,7 +95,7 @@
+
+ if (actionOffset != 0) {
+ LEReferenceTo<LigatureActionEntry> ap(stHeader, success, ligActionOffset); // byte offset
+- ap.addObject(ligActionIndex - 1, success); // index offset ( one before the actual start, because we will pre-increment)
++ ap.addObject(ligActionIndex, success);
+ LEReferenceToArrayOf<TTGlyphID> ligatureTable(stHeader, success, ligatureOffset, LE_UNBOUNDED_ARRAY);
+ LigatureActionEntry action;
+ le_int32 offset, i = 0;
+@@ -111,7 +111,6 @@
+ do {
+ le_uint32 componentGlyph = componentStack[m--]; // pop off
+
+- ap.addObject(success);
+ action = SWAPL(*ap.getAlias());
+
+ if (m < 0) {
+@@ -145,7 +144,8 @@
+ LE_DEBUG_BAD_FONT("m<0")
+ }
+ #endif
+- } while (!(action & lafLast) && (m>=0) ); // stop if last bit is set, or if run out of items
++ ap.addObject(success);
++ } while (LE_SUCCESS(success) && !(action & lafLast) && (m>=0) ); // stop if last bit is set, or if run out of items
+
+ while (mm >= 0) {
+ if (++m >= nComponents) {
--- jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -49,14 +49,20 @@
return 0;
}
@@ -62346,7 +50387,7 @@
TTGlyphID deletedGlyph = tempIterator.ignoresMarks()? 0xFFFE : 0xFFFF;
--- jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -60,8 +60,10 @@
LEReferenceTo<LookupSubtable> lookupSubtable = lookupTable->getLookupSubtable(lookupTable, subtable, success);
@@ -62426,8 +50467,16 @@
for (le_int32 f = 0; f < featureMapCount; f += 1) {
FeatureMap fm = featureMap[f];
+@@ -272,6 +282,7 @@
+
+ for (le_uint16 feature = 0; feature < featureCount; feature += 1) {
+ LEReferenceToArrayOf<le_uint16> featureIndexArray(langSysTable, success, langSysTable->featureIndexArray, featureCount);
++ if (LE_FAILURE(success)) { continue; }
+ le_uint16 featureIndex = SWAPW(featureIndexArray.getObject(feature,success));
+
+ // don't add the required feature to the list more than once...
--- jdk/src/share/native/sun/font/layout/Lookups.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/Lookups.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/Lookups.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -65,7 +65,7 @@
if(LE_FAILURE(success)) return 0;
@@ -62438,7 +50487,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -38,20 +38,28 @@
U_NAMESPACE_BEGIN
@@ -62475,7 +50524,7 @@
}
--- jdk/src/share/native/sun/font/layout/MarkArrays.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MarkArrays.h 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/MarkArrays.h 2014-04-20 12:39:16.000000000 -0700
@@ -54,8 +54,9 @@
le_uint16 markCount;
MarkRecord markRecordArray[ANY_NUMBER];
@@ -62489,14 +50538,15 @@
LE_VAR_ARRAY(MarkArray, markRecordArray)
--- jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2014-01-18 12:16:23.000000000 -0800
-@@ -66,11 +66,11 @@
++++ jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -66,11 +66,12 @@
}
LEPoint markAnchor;
- const MarkArray *markArray = (const MarkArray *) ((char *) this + SWAPW(markArrayOffset));
- le_int32 markClass = markArray->getMarkClass(markGlyph, markCoverage, fontInstance, markAnchor);
+ LEReferenceTo<MarkArray> markArray(base, success, (const MarkArray *) ((char *) this + SWAPW(markArrayOffset)));
++ if(LE_FAILURE(success)) return 0;
+ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
le_uint16 mcCount = SWAPW(classCount);
@@ -62505,7 +50555,7 @@
// markGlyph isn't in the mark array or its
// mark class is too big. The table is mal-formed!
return 0;
-@@ -80,7 +80,8 @@
+@@ -80,7 +81,8 @@
GlyphIterator baseIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreLigatures*/));
LEGlyphID baseGlyph = findBaseGlyph(&baseIterator);
le_int32 baseCoverage = getBaseCoverage(base, (LEGlyphID) baseGlyph, success);
@@ -62515,7 +50565,7 @@
le_uint16 baseCount = SWAPW(baseArray->baseRecordCount);
if (baseCoverage < 0 || baseCoverage >= baseCount) {
-@@ -89,19 +90,23 @@
+@@ -89,19 +91,23 @@
// table is mal-formed...
return 0;
}
@@ -62545,7 +50595,7 @@
fontInstance->getGlyphAdvance(markGlyph, pixels);
fontInstance->pixelsToUnits(pixels, markAdvance);
-@@ -109,6 +114,8 @@
+@@ -109,6 +115,8 @@
float anchorDiffX = baseAnchor.fX - markAnchor.fX;
float anchorDiffY = baseAnchor.fY - markAnchor.fY;
@@ -62554,7 +50604,7 @@
glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
if (glyphIterator->isRightToLeft()) {
-@@ -132,7 +139,6 @@
+@@ -132,7 +140,6 @@
gi.next();
}
// end of JK patch
@@ -62563,7 +50613,7 @@
glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY);
--- jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -65,8 +65,11 @@
}
@@ -62615,7 +50665,7 @@
fontInstance->getGlyphAdvance(markGlyph, pixels);
fontInstance->pixelsToUnits(pixels, markAdvance);
--- jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -66,8 +66,11 @@
}
@@ -62673,7 +50723,7 @@
if (glyphIterator->isRightToLeft()) {
--- jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -54,9 +54,10 @@
// FIXME: is this always the right thing to do?
// FIXME: should this only be done for a non-zero
@@ -62714,7 +50764,7 @@
}
}
--- jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2014-01-18 12:16:23.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -470,6 +470,7 @@
void OpenTypeLayoutEngine::adjustGlyphPositions(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse,
LEGlyphStorage &glyphStorage, LEErrorCode &success)
@@ -62750,15 +50800,15 @@
xAdjust += fFontInstance->xUnitsToPoints(xAdvance);
--- jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2013-12-01 11:14:30.000000000 -0800
-@@ -79,6 +79,7 @@
-
++++ jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -80,6 +80,7 @@
Offset OpenTypeUtilities::getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success)
{
-+ const TagAndOffsetRecord *r0 = (const TagAndOffsetRecord*)records.getAlias();
if(LE_FAILURE(success)) return 0;
++ const TagAndOffsetRecord *r0 = (const TagAndOffsetRecord*)records.getAlias();
le_uint32 recordCount = records.getCount();
+ le_uint8 bit = highBit(recordCount);
@@ -89,17 +90,17 @@
le_int32 index = 0;
@@ -62793,7 +50843,7 @@
}
--- jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2014-04-20 12:39:16.000000000 -0700
@@ -46,15 +46,14 @@
public:
static le_int8 highBit(le_int32 value);
@@ -62813,7 +50863,7 @@
static le_int32 search(le_uint16 value, const le_uint16 array[], le_int32 count);
static le_int32 search(le_uint32 value, const le_uint32 array[], le_int32 count);
--- jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -76,19 +76,17 @@
{
LEGlyphID firstGlyph = glyphIterator->getCurrGlyphID();
@@ -62952,7 +51002,7 @@
U_NAMESPACE_END
--- jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2014-04-20 12:39:16.000000000 -0700
@@ -77,9 +77,8 @@
le_uint32 process(const LEReferenceTo<PairPositioningFormat1Subtable> &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const;
@@ -62965,7 +51015,7 @@
LE_VAR_ARRAY(PairPositioningFormat1Subtable, pairSetTableOffsetArray)
--- jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -106,7 +106,8 @@
}
} else {
@@ -62977,7 +51027,7 @@
if (scriptTableOffset != 0) {
--- jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -126,13 +126,13 @@
linaScriptTag, /* 'lina' (LINA) */
mandScriptTag, /* 'mand' (MANDAIC) */
@@ -63013,7 +51063,7 @@
nbatScriptTag, /* 'nbat' (NBAT) */
palmScriptTag, /* 'palm' (PALM) */
--- jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2014-04-20 12:39:16.000000000 -0700
@@ -140,13 +140,13 @@
const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINA) */
const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */
@@ -63048,8 +51098,18 @@
const LETag narbScriptTag = 0x6E617262; /* 'narb' (NARB) */
const LETag nbatScriptTag = 0x6E626174; /* 'nbat' (NBAT) */
const LETag palmScriptTag = 0x70616C6D; /* 'palm' (PALM) */
+--- jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -73,6 +73,7 @@
+
+ if (offset != 0) {
+ LEReferenceToArrayOf<TTGlyphID> glyphArray(subtableHeader, success, offset, LE_UNBOUNDED_ARRAY);
++ if (LE_FAILURE(success)) { continue; }
+ TTGlyphID newGlyph = SWAPW(glyphArray(LE_GET_GLYPH(thisGlyph) - firstGlyph, success));
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
--- jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -65,16 +65,17 @@
for (glyph = 0; glyph < glyphCount; glyph += 1) {
@@ -63075,7 +51135,7 @@
}
}
--- jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -75,7 +75,7 @@
}
@@ -63095,7 +51155,7 @@
return 1;
}
--- jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -76,7 +76,7 @@
if (coverageIndex >= 0) {
TTGlyphID substitute = ((TTGlyphID) LE_GET_GLYPH(glyph)) + SWAPW(deltaGlyphID);
@@ -63114,8 +51174,18 @@
glyphIterator->setCurrGlyphID(substitute);
}
+--- jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp 2014-04-20 12:39:16.000000000 -0700
+@@ -97,6 +97,7 @@
+
+ LEReferenceToArrayOf<EntryTableIndex> stateArray(stHeader, success, currentState, LE_UNBOUNDED_ARRAY);
+ EntryTableIndex entryTableIndex = stateArray.getObject((le_uint8)classCode, success);
++ if (LE_FAILURE(success)) { break; }
+ LE_STATE_PATIENCE_CURR(le_int32, currGlyph);
+ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex);
+ LE_STATE_PATIENCE_INCR(currGlyph);
--- jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2013-12-01 11:14:30.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -104,6 +104,10 @@
int putGV(JNIEnv* env, jint gmask, jint baseIndex, jobject gvdata, const LayoutEngine* engine, int glyphCount) {
@@ -63128,7 +51198,7 @@
jarray glyphArray = (jarray)env->GetObjectField(gvdata, gvdGlyphsFID);
if (IS_NULL(glyphArray)) {
--- jdk/src/share/native/sun/font/layout/TibetanReordering.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/TibetanReordering.h 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/TibetanReordering.h 2014-04-20 12:39:16.000000000 -0700
@@ -39,7 +39,7 @@
*/
@@ -63139,7 +51209,7 @@
/**
* \file
--- jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2014-04-20 12:39:16.000000000 -0700
@@ -59,8 +59,8 @@
return SWAPW(value);
}
@@ -63251,7 +51321,7 @@
yAdvanceAdjustment += fontInstance->yPixelsToUnits(yAdj);
}
--- jdk/src/share/native/sun/font/layout/ValueRecords.h 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/font/layout/ValueRecords.h 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/font/layout/ValueRecords.h 2014-04-20 12:39:16.000000000 -0700
@@ -53,10 +53,10 @@
le_int16 getFieldValue(ValueFormat valueFormat, ValueRecordField field) const;
@@ -63267,16 +51337,1036 @@
static le_int16 getSize(ValueFormat valueFormat);
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2014-04-20 12:39:16.000000000 -0700
+@@ -81,7 +81,7 @@
+ cmsUInt32Number surround;
+ cmsFloat64Number n, Nbb, Ncb, z, FL, D;
+
+- cmsContext ContextID;
++ cmsContext ContextID;
+
+ } cmsCIECAM02;
+
+@@ -467,6 +467,7 @@
+ CAM02COLOR clr;
+ cmsCIECAM02* lpMod = (cmsCIECAM02*) hModel;
+
++ memset(&clr, 0, sizeof(clr));
+ _cmsAssert(lpMod != NULL);
+ _cmsAssert(pIn != NULL);
+ _cmsAssert(pOut != NULL);
+@@ -491,6 +492,7 @@
+ CAM02COLOR clr;
+ cmsCIECAM02* lpMod = (cmsCIECAM02*) hModel;
+
++ memset(&clr, 0, sizeof(clr));
+ _cmsAssert(lpMod != NULL);
+ _cmsAssert(pIn != NULL);
+ _cmsAssert(pOut != NULL);
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2014-04-20 12:39:16.000000000 -0700
+@@ -59,8 +59,8 @@
+ // IT8.7 / CGATS.17-200x handling -----------------------------------------------------------------------------
+
+
+-#define MAXID 128 // Max lenght of identifier
+-#define MAXSTR 1024 // Max lenght of string
++#define MAXID 128 // Max length of identifier
++#define MAXSTR 1024 // Max length of string
+ #define MAXTABLES 255 // Max Number of tables in a single stream
+ #define MAXINCLUDE 20 // Max number of nested includes
+
+@@ -383,28 +383,28 @@
+ //Forward declaration of some internal functions
+ static void* AllocChunk(cmsIT8* it8, cmsUInt32Number size);
+
+-// Checks if c is a separator
++// Checks whatever c is a separator
+ static
+ cmsBool isseparator(int c)
+ {
+- return (c == ' ') || (c == '\t') || (c == '\r');
++ return (c == ' ') || (c == '\t') ;
+ }
+
+-// Checks whatever if c is a valid identifier char
++// Checks whatever c is a valid identifier char
+ static
+ cmsBool ismiddle(int c)
+ {
+ return (!isseparator(c) && (c != '#') && (c !='\"') && (c != '\'') && (c > 32) && (c < 127));
+ }
+
+-// Checks whatsever if c is a valid identifier middle char.
++// Checks whatsever c is a valid identifier middle char.
+ static
+ cmsBool isidchar(int c)
+ {
+ return isalnum(c) || ismiddle(c);
+ }
+
+-// Checks whatsever if c is a valid identifier first char.
++// Checks whatsever c is a valid identifier first char.
+ static
+ cmsBool isfirstidchar(int c)
+ {
+@@ -436,7 +436,6 @@
+ }
+
+
+-
+ // Makes a file path based on a given reference path
+ // NOTE: this function doesn't check if the path exists or even if it's legal
+ static
+@@ -634,6 +633,9 @@
+ cmsFloat64Number dnum = 0.0;
+ int sign = 1;
+
++ // keep safe
++ if (Buffer == NULL) return 0.0;
++
+ if (*Buffer == '-' || *Buffer == '+') {
+
+ sign = (*Buffer == '-') ? -1 : 1;
+@@ -867,6 +869,14 @@
+
+
+ // Next line
++ case '\r':
++ NextCh(it8);
++ if (it8 ->ch == '\n')
++ NextCh(it8);
++ it8->sy = SEOLN;
++ it8->lineno++;
++ break;
++
+ case '\n':
+ NextCh(it8);
+ it8->sy = SEOLN;
+@@ -876,7 +886,7 @@
+ // Comment
+ case '#':
+ NextCh(it8);
+- while (it8->ch && it8->ch != '\n')
++ while (it8->ch && it8->ch != '\n' && it8->ch != '\r')
+ NextCh(it8);
+
+ it8->sy = SCOMMENT;
+@@ -994,6 +1004,9 @@
+ {
+ switch (it8->sy) {
+
++ case SEOLN: // Empty value
++ Buffer[0]=0;
++ break;
+ case SIDENT: strncpy(Buffer, it8->id, max);
+ Buffer[max-1]=0;
+ break;
+@@ -1143,9 +1156,9 @@
+ if (*Key != '#') { // Comments are ignored
+
+ if (cmsstrcasecmp(Key, p->Keyword) == 0)
+- break;
+- }
++ break;
+ }
++ }
+
+ if (p == NULL)
+ return FALSE;
+@@ -1155,11 +1168,13 @@
+
+ for (; p != NULL; p = p->NextSubkey) {
+
++ if (p ->Subkey == NULL) continue;
++
+ if (LastPtr) *LastPtr = p;
+
+ if (cmsstrcasecmp(Subkey, p->Subkey) == 0)
+- return TRUE;
+- }
++ return TRUE;
++ }
+
+ return FALSE;
+ }
+@@ -1282,7 +1297,7 @@
+
+ it8 ->nTable = nTable;
+
+- return nTable;
++ return (cmsInt32Number) nTable;
+ }
+
+
+@@ -1387,7 +1402,7 @@
+ cmsIT8* it8 = (cmsIT8*) hIT8;
+ char Buffer[1024];
+
+- sprintf(Buffer, "%d", Val);
++ sprintf(Buffer, "%u", Val);
+
+ return AddToList(it8, &GetTable(it8)->HeaderList, cProp, NULL, Buffer, WRITE_HEXADECIMAL) != NULL;
+ }
+@@ -1424,6 +1439,8 @@
+ {
+ const char *v = cmsIT8GetProperty(hIT8, cProp);
+
++ if (v == NULL) return 0.0;
++
+ return ParseFloatNumber(v);
+ }
+
+@@ -1456,7 +1473,7 @@
+ t -> nSamples = 10;
+ }
+
+- t -> DataFormat = (char**) AllocChunk (it8, (t->nSamples + 1) * sizeof(char *));
++ t -> DataFormat = (char**) AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * sizeof(char *));
+ if (t->DataFormat == NULL) {
+
+ SynError(it8, "AllocateDataFormat: Unable to allocate dataFormat array");
+@@ -1512,7 +1529,7 @@
+ t-> nSamples = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
+ t-> nPatches = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
+
+- t-> Data = (char**)AllocChunk (it8, (t->nSamples + 1) * (t->nPatches + 1) *sizeof (char*));
++ t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*));
+ if (t->Data == NULL) {
+
+ SynError(it8, "AllocateDataSet: Unable to allocate data array");
+@@ -1571,7 +1588,7 @@
+ if (str == NULL)
+ str = " ";
+
+- // Lenghth to write
++ // Length to write
+ len = (cmsUInt32Number) strlen(str);
+ f ->Used += len;
+
+@@ -2095,7 +2112,7 @@
+ NextCh(it8);
+
+ // If a newline is found, then this is a type string
+- if (it8 ->ch == '\n') {
++ if (it8 ->ch == '\n' || it8->ch == '\r') {
+
+ cmsIT8SetSheetType(it8, it8 ->id);
+ InSymbol(it8);
+@@ -2210,7 +2227,7 @@
+ char Buffer[256];
+
+ char *Type = p ->Value;
+- int nTable = k;
++ int nTable = (int) k;
+
+ snprintf(Buffer, 255, "%s %d %s", Label, nTable, Type );
+
+@@ -2564,6 +2581,8 @@
+
+ Buffer = cmsIT8GetDataRowCol(hIT8, row, col);
+
++ if (Buffer == NULL) return 0.0;
++
+ return ParseFloatNumber(Buffer);
+ }
+
+@@ -2776,7 +2795,7 @@
+ if (Formatter == NULL)
+ strcpy(it8->DoubleFormatter, DEFAULT_DBL_FORMAT);
+ else
+- strcpy(it8->DoubleFormatter, Formatter);
++ strncpy(it8->DoubleFormatter, Formatter, sizeof(it8->DoubleFormatter));
+
+ it8 ->DoubleFormatter[sizeof(it8 ->DoubleFormatter)-1] = 0;
+ }
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2014-04-20 12:39:16.000000000 -0700
+@@ -270,7 +270,7 @@
+ // m2 holds CHAD from output white to D50 times abs. col. scaling
+
+ // Observer is not adapted, undo the chromatic adaptation
+- _cmsMAT3per(m, &m3, ChromaticAdaptationMatrixOut);
++ _cmsMAT3per(m, &m2, ChromaticAdaptationMatrixOut);
+
+ m3 = *ChromaticAdaptationMatrixIn;
+ if (!_cmsMAT3inverse(&m3, &m4)) return FALSE;
+@@ -411,57 +411,61 @@
+ // Handle PCS mismatches. A specialized stage is added to the LUT in such case
+ switch (InPCS) {
+
+- case cmsSigXYZData: // Input profile operates in XYZ
++ case cmsSigXYZData: // Input profile operates in XYZ
+
+- switch (OutPCS) {
++ switch (OutPCS) {
+
+- case cmsSigXYZData: // XYZ -> XYZ
+- if (!IsEmptyLayer(m, off))
+- cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl));
+- break;
+-
+- case cmsSigLabData: // XYZ -> Lab
+- if (!IsEmptyLayer(m, off))
+- cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl));
+- cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocXYZ2Lab(Result ->ContextID));
+- break;
+-
+- default:
+- return FALSE; // Colorspace mismatch
+- }
+- break;
++ case cmsSigXYZData: // XYZ -> XYZ
++ if (!IsEmptyLayer(m, off) &&
++ !cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl)))
++ return FALSE;
++ break;
+
++ case cmsSigLabData: // XYZ -> Lab
++ if (!IsEmptyLayer(m, off) &&
++ !cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl)))
++ return FALSE;
++ if (!cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocXYZ2Lab(Result ->ContextID)))
++ return FALSE;
++ break;
+
+- case cmsSigLabData: // Input profile operates in Lab
++ default:
++ return FALSE; // Colorspace mismatch
++ }
++ break;
+
+- switch (OutPCS) {
++ case cmsSigLabData: // Input profile operates in Lab
+
+- case cmsSigXYZData: // Lab -> XYZ
++ switch (OutPCS) {
+
+- cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocLab2XYZ(Result ->ContextID));
+- if (!IsEmptyLayer(m, off))
+- cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl));
+- break;
++ case cmsSigXYZData: // Lab -> XYZ
+
+- case cmsSigLabData: // Lab -> Lab
++ if (!cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocLab2XYZ(Result ->ContextID)))
++ return FALSE;
++ if (!IsEmptyLayer(m, off) &&
++ !cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl)))
++ return FALSE;
++ break;
+
+- if (!IsEmptyLayer(m, off)) {
+- cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocLab2XYZ(Result ->ContextID));
+- cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl));
+- cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocXYZ2Lab(Result ->ContextID));
+- }
+- break;
++ case cmsSigLabData: // Lab -> Lab
+
+- default:
+- return FALSE; // Mismatch
++ if (!IsEmptyLayer(m, off)) {
++ if (!cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocLab2XYZ(Result ->ContextID)) ||
++ !cmsPipelineInsertStage(Result, cmsAT_END, cmsStageAllocMatrix(Result ->ContextID, 3, 3, m_as_dbl, off_as_dbl)) ||
++ !cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocXYZ2Lab(Result ->ContextID)))
++ return FALSE;
+ }
+ break;
+
+-
+- // On colorspaces other than PCS, check for same space
+ default:
+- if (InPCS != OutPCS) return FALSE;
+- break;
++ return FALSE; // Mismatch
++ }
++ break;
++
++ // On colorspaces other than PCS, check for same space
++ default:
++ if (InPCS != OutPCS) return FALSE;
++ break;
+ }
+
+ return TRUE;
+@@ -497,7 +501,8 @@
+ cmsFloat64Number AdaptationStates[],
+ cmsUInt32Number dwFlags)
+ {
+- cmsPipeline* Lut, *Result;
++ cmsPipeline* Lut = NULL;
++ cmsPipeline* Result;
+ cmsHPROFILE hProfile;
+ cmsMAT3 m;
+ cmsVEC3 off;
+@@ -593,8 +598,11 @@
+ }
+
+ // Concatenate to the output LUT
+- cmsPipelineCat(Result, Lut);
++ if (!cmsPipelineCat(Result, Lut))
++ goto Error;
++
+ cmsPipelineFree(Lut);
++ Lut = NULL;
+
+ // Update current space
+ CurrentColorSpace = ColorSpaceOut;
+@@ -604,6 +612,7 @@
+
+ Error:
+
++ if (Lut != NULL) cmsPipelineFree(Lut);
+ if (Result != NULL) cmsPipelineFree(Result);
+ return NULL;
+
+@@ -742,7 +751,8 @@
+ if (CLUT == NULL) goto Error;
+
+ // This is the one and only MPE in this LUT
+- cmsPipelineInsertStage(Result, cmsAT_BEGIN, CLUT);
++ if (!cmsPipelineInsertStage(Result, cmsAT_BEGIN, CLUT))
++ goto Error;
+
+ // Sample it. We cannot afford pre/post linearization this time.
+ if (!cmsStageSampleCLut16bit(CLUT, BlackPreservingGrayOnlySampler, (void*) &bp, 0))
+@@ -959,7 +969,8 @@
+ CLUT = cmsStageAllocCLut16bit(ContextID, nGridPoints, 4, 4, NULL);
+ if (CLUT == NULL) goto Cleanup;
+
+- cmsPipelineInsertStage(Result, cmsAT_BEGIN, CLUT);
++ if (!cmsPipelineInsertStage(Result, cmsAT_BEGIN, CLUT))
++ goto Cleanup;
+
+ cmsStageSampleCLut16bit(CLUT, BlackPreservingSampler, (void*) &bp, 0);
+
+@@ -1057,7 +1068,7 @@
+ }
+
+ // The plug-in registration. User can add new intents or override default routines
+-cmsBool _cmsRegisterRenderingIntentPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterRenderingIntentPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginRenderingIntent* Plugin = (cmsPluginRenderingIntent*) Data;
+ cmsIntentsList* fl;
+@@ -1072,7 +1083,7 @@
+ fl = SearchIntent(Plugin ->Intent);
+
+ if (fl == NULL) {
+- fl = (cmsIntentsList*) _cmsPluginMalloc(sizeof(cmsIntentsList));
++ fl = (cmsIntentsList*) _cmsPluginMalloc(id, sizeof(cmsIntentsList));
+ if (fl == NULL) return FALSE;
+ }
+
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2014-04-20 12:39:16.000000000 -0700
+@@ -302,8 +302,6 @@
+ return NULL;
+ }
+
+-
+-
+ chunk ->BlockSize = Initial;
+ chunk ->Used = 0;
+ chunk ->next = NULL;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2014-04-20 12:39:16.000000000 -0700
+@@ -30,7 +30,7 @@
+ //---------------------------------------------------------------------------------
+ //
+ // Little Color Management System
+-// Copyright (c) 1998-2012 Marti Maria Saguer
++// Copyright (c) 1998-2013 Marti Maria Saguer
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -99,7 +99,7 @@
+ static _cmsParametricCurvesCollection* ParametricCurves = &DefaultCurves;
+
+ // As a way to install new parametric curves
+-cmsBool _cmsRegisterParametricCurvesPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterParametricCurvesPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginParametricCurves* Plugin = (cmsPluginParametricCurves*) Data;
+ _cmsParametricCurvesCollection* fl;
+@@ -110,7 +110,7 @@
+ return TRUE;
+ }
+
+- fl = (_cmsParametricCurvesCollection*) _cmsPluginMalloc(sizeof(_cmsParametricCurvesCollection));
++ fl = (_cmsParametricCurvesCollection*) _cmsPluginMalloc(id, sizeof(_cmsParametricCurvesCollection));
+ if (fl == NULL) return FALSE;
+
+ // Copy the parameters
+@@ -258,7 +258,8 @@
+ }
+
+ p ->InterpParams = _cmsComputeInterpParams(ContextID, p ->nEntries, 1, 1, p->Table16, CMS_LERP_FLAGS_16BITS);
+- return p;
++ if (p->InterpParams != NULL)
++ return p;
+
+ Error:
+ if (p -> Segments) _cmsFree(ContextID, p ->Segments);
+@@ -423,7 +424,7 @@
+ if (e > 0)
+ Val = pow(e, Params[0]) + Params[5];
+ else
+- Val = 0;
++ Val = Params[5];
+ }
+ else
+ Val = R*Params[3] + Params[6];
+@@ -458,7 +459,7 @@
+ e = Params[1]*R + Params[2];
+
+ if (e < 0)
+- Val = 0;
++ Val = Params[3];
+ else
+ Val = pow(e, Params[0]) + Params[3];
+ break;
+@@ -478,7 +479,7 @@
+
+ e = Params[2] * pow(R, Params[0]) + Params[3];
+ if (e <= 0)
+- Val = 0;
++ Val = Params[4];
+ else
+ Val = Params[1]*log10(e) + Params[4];
+ break;
+@@ -544,7 +545,7 @@
+ // Type == 0 means segment is sampled
+ if (g ->Segments[i].Type == 0) {
+
+- cmsFloat32Number R1 = (cmsFloat32Number) (R - g ->Segments[i].x0);
++ cmsFloat32Number R1 = (cmsFloat32Number) (R - g ->Segments[i].x0) / (g ->Segments[i].x1 - g ->Segments[i].x0);
+ cmsFloat32Number Out;
+
+ // Setup the table (TODO: clean that)
+@@ -629,20 +630,21 @@
+ // Use a segmented curve to store the floating point table
+ cmsToneCurve* CMSEXPORT cmsBuildTabulatedToneCurveFloat(cmsContext ContextID, cmsUInt32Number nEntries, const cmsFloat32Number values[])
+ {
+- cmsCurveSegment Seg[2];
++ cmsCurveSegment Seg[3];
+
+- // Initialize segmented curve part up to 0
+- Seg[0].x0 = -1;
++ // A segmented tone curve should have function segments in the first and last positions
++ // Initialize segmented curve part up to 0 to constant value = samples[0]
++ Seg[0].x0 = MINUS_INF;
+ Seg[0].x1 = 0;
+ Seg[0].Type = 6;
+
+ Seg[0].Params[0] = 1;
+ Seg[0].Params[1] = 0;
+ Seg[0].Params[2] = 0;
+- Seg[0].Params[3] = 0;
++ Seg[0].Params[3] = values[0];
+ Seg[0].Params[4] = 0;
+
+- // From zero to any
++ // From zero to 1
+ Seg[1].x0 = 0;
+ Seg[1].x1 = 1.0;
+ Seg[1].Type = 0;
+@@ -650,7 +652,19 @@
+ Seg[1].nGridPoints = nEntries;
+ Seg[1].SampledPoints = (cmsFloat32Number*) values;
+
+- return cmsBuildSegmentedToneCurve(ContextID, 2, Seg);
++ // Final segment is constant = lastsample
++ Seg[2].x0 = 1.0;
++ Seg[2].x1 = PLUS_INF;
++ Seg[2].Type = 6;
++
++ Seg[2].Params[0] = 1;
++ Seg[2].Params[1] = 0;
++ Seg[2].Params[2] = 0;
++ Seg[2].Params[3] = values[nEntries-1];
++ Seg[2].Params[4] = 0;
++
++
++ return cmsBuildSegmentedToneCurve(ContextID, 3, Seg);
+ }
+
+ // Parametric curves
+@@ -993,7 +1007,7 @@
+
+ if (Tab == NULL) return FALSE;
+
+- if (cmsIsToneCurveLinear(Tab)) return FALSE; // Nothing to do
++ if (cmsIsToneCurveLinear(Tab)) return TRUE; // Nothing to do
+
+ nItems = Tab -> nEntries;
+
+@@ -1020,11 +1034,20 @@
+
+ if (z[i] == 0.) Zeros++;
+ if (z[i] >= 65535.) Poles++;
+- if (z[i] < z[i-1]) return FALSE; // Non-Monotonic
++ if (z[i] < z[i-1]) {
++ cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Non-Monotonic.");
++ return FALSE;
++ }
+ }
+
+- if (Zeros > (nItems / 3)) return FALSE; // Degenerated, mostly zeros
+- if (Poles > (nItems / 3)) return FALSE; // Degenerated, mostly poles
++ if (Zeros > (nItems / 3)) {
++ cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly zeros.");
++ return FALSE;
++ }
++ if (Poles > (nItems / 3)) {
++ cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly poles.");
++ return FALSE;
++ }
+
+ // Seems ok
+ for (i=0; i < nItems; i++) {
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2014-04-20 12:39:16.000000000 -0700
+@@ -249,13 +249,10 @@
+ cmsFloat64Number dE1, dE2, ErrorRatio;
+
+ // Assume in-gamut by default.
+- dE1 = 0.;
+- dE2 = 0;
+ ErrorRatio = 1.0;
+
+ // Convert input to Lab
+- if (t -> hInput != NULL)
+- cmsDoTransform(t -> hInput, In, &LabIn1, 1);
++ cmsDoTransform(t -> hInput, In, &LabIn1, 1);
+
+ // converts from PCS to colorant. This always
+ // does return in-gamut values,
+@@ -267,7 +264,7 @@
+ memmove(&LabIn2, &LabOut1, sizeof(cmsCIELab));
+
+ // Try again, but this time taking Check as input
+- cmsDoTransform(t -> hForward, &LabOut1, Proof2, 1);
++ cmsDoTransform(t -> hForward, &LabOut1, Proof2, 1);
+ cmsDoTransform(t -> hReverse, Proof2, &LabOut2, 1);
+
+ // Take difference of direct value
+@@ -374,7 +371,7 @@
+ ProfileList[nGamutPCSposition] = hLab;
+ BPCList[nGamutPCSposition] = 0;
+ AdaptationList[nGamutPCSposition] = 1.0;
+- Intents[nGamutPCSposition] = INTENT_RELATIVE_COLORIMETRIC;
++ IntentList[nGamutPCSposition] = INTENT_RELATIVE_COLORIMETRIC;
+
+
+ ColorSpace = cmsGetColorSpace(hGamut);
+@@ -385,45 +382,48 @@
+
+ // 16 bits to Lab double
+ Chain.hInput = cmsCreateExtendedTransform(ContextID,
+- nGamutPCSposition + 1,
+- ProfileList,
+- BPCList,
+- Intents,
+- AdaptationList,
+- NULL, 0,
+- dwFormat, TYPE_Lab_DBL,
+- cmsFLAGS_NOCACHE);
++ nGamutPCSposition + 1,
++ ProfileList,
++ BPCList,
++ IntentList,
++ AdaptationList,
++ NULL, 0,
++ dwFormat, TYPE_Lab_DBL,
++ cmsFLAGS_NOCACHE);
+
+
+ // Does create the forward step. Lab double to device
+ dwFormat = (CHANNELS_SH(nChannels)|BYTES_SH(2));
+ Chain.hForward = cmsCreateTransformTHR(ContextID,
+- hLab, TYPE_Lab_DBL,
+- hGamut, dwFormat,
+- INTENT_RELATIVE_COLORIMETRIC,
+- cmsFLAGS_NOCACHE);
++ hLab, TYPE_Lab_DBL,
++ hGamut, dwFormat,
++ INTENT_RELATIVE_COLORIMETRIC,
++ cmsFLAGS_NOCACHE);
+
+ // Does create the backwards step
+ Chain.hReverse = cmsCreateTransformTHR(ContextID, hGamut, dwFormat,
+- hLab, TYPE_Lab_DBL,
+- INTENT_RELATIVE_COLORIMETRIC,
+- cmsFLAGS_NOCACHE);
++ hLab, TYPE_Lab_DBL,
++ INTENT_RELATIVE_COLORIMETRIC,
++ cmsFLAGS_NOCACHE);
+
+
+ // All ok?
+- if (Chain.hForward && Chain.hReverse) {
++ if (Chain.hInput && Chain.hForward && Chain.hReverse) {
+
+ // Go on, try to compute gamut LUT from PCS. This consist on a single channel containing
+ // dE when doing a transform back and forth on the colorimetric intent.
+
+ Gamut = cmsPipelineAlloc(ContextID, 3, 1);
+-
+ if (Gamut != NULL) {
+
+- CLUT = cmsStageAllocCLut16bit(ContextID, nGridpoints, nChannels, 1, NULL);
+- cmsPipelineInsertStage(Gamut, cmsAT_BEGIN, CLUT);
+-
+- cmsStageSampleCLut16bit(CLUT, GamutSampler, (void*) &Chain, 0);
++ CLUT = cmsStageAllocCLut16bit(ContextID, nGridpoints, nChannels, 1, NULL);
++ if (!cmsPipelineInsertStage(Gamut, cmsAT_BEGIN, CLUT)) {
++ cmsPipelineFree(Gamut);
++ Gamut = NULL;
++ }
++ else {
++ cmsStageSampleCLut16bit(CLUT, GamutSampler, (void*) &Chain, 0);
++ }
+ }
+ }
+ else
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2014-04-20 12:39:16.000000000 -0700
+@@ -83,7 +83,6 @@
+
+
+ // Set the interpolation method
+-
+ cmsBool _cmsSetInterpolationRoutine(cmsInterpParams* p)
+ {
+ // Invoke factory, possibly in the Plug-in
+@@ -215,6 +214,11 @@
+ Output[0] = LinearInterp(rest, y0, y1);
+ }
+
++// To prevent out of bounds indexing
++cmsINLINE cmsFloat32Number fclamp(cmsFloat32Number v)
++{
++ return v < 0.0f ? 0.0f : (v > 1.0f ? 1.0f : v);
++}
+
+ // Floating-point version of 1D interpolation
+ static
+@@ -227,13 +231,15 @@
+ int cell0, cell1;
+ const cmsFloat32Number* LutTable = (cmsFloat32Number*) p ->Table;
+
++ val2 = fclamp(Value[0]);
++
+ // if last value...
+- if (Value[0] == 1.0) {
++ if (val2 == 1.0) {
+ Output[0] = LutTable[p -> Domain[0]];
+ return;
+ }
+
+- val2 = p -> Domain[0] * Value[0];
++ val2 *= p -> Domain[0];
+
+ cell0 = (int) floor(val2);
+ cell1 = (int) ceil(val2);
+@@ -292,13 +298,15 @@
+ cmsUInt32Number OutChan;
+ const cmsFloat32Number* LutTable = (cmsFloat32Number*) p ->Table;
+
++ val2 = fclamp(Value[0]);
++
+ // if last value...
+- if (Value[0] == 1.0) {
++ if (val2 == 1.0) {
+ Output[0] = LutTable[p -> Domain[0]];
+ return;
+ }
+
+- val2 = p -> Domain[0] * Value[0];
++ val2 *= p -> Domain[0];
+
+ cell0 = (int) floor(val2);
+ cell1 = (int) ceil(val2);
+@@ -339,8 +347,8 @@
+ dxy;
+
+ TotalOut = p -> nOutputs;
+- px = Input[0] * p->Domain[0];
+- py = Input[1] * p->Domain[1];
++ px = fclamp(Input[0]) * p->Domain[0];
++ py = fclamp(Input[1]) * p->Domain[1];
+
+ x0 = (int) _cmsQuickFloor(px); fx = px - (cmsFloat32Number) x0;
+ y0 = (int) _cmsQuickFloor(py); fy = py - (cmsFloat32Number) y0;
+@@ -454,20 +462,9 @@
+ TotalOut = p -> nOutputs;
+
+ // We need some clipping here
+- px = Input[0];
+- py = Input[1];
+- pz = Input[2];
+-
+- if (px < 0) px = 0;
+- if (px > 1) px = 1;
+- if (py < 0) py = 0;
+- if (py > 1) py = 1;
+- if (pz < 0) pz = 0;
+- if (pz > 1) pz = 1;
+-
+- px *= p->Domain[0];
+- py *= p->Domain[1];
+- pz *= p->Domain[2];
++ px = fclamp(Input[0]) * p->Domain[0];
++ py = fclamp(Input[1]) * p->Domain[1];
++ pz = fclamp(Input[2]) * p->Domain[2];
+
+ x0 = (int) _cmsQuickFloor(px); fx = px - (cmsFloat32Number) x0;
+ y0 = (int) _cmsQuickFloor(py); fy = py - (cmsFloat32Number) y0;
+@@ -609,20 +606,9 @@
+ TotalOut = p -> nOutputs;
+
+ // We need some clipping here
+- px = Input[0];
+- py = Input[1];
+- pz = Input[2];
+-
+- if (px < 0) px = 0;
+- if (px > 1) px = 1;
+- if (py < 0) py = 0;
+- if (py > 1) py = 1;
+- if (pz < 0) pz = 0;
+- if (pz > 1) pz = 1;
+-
+- px *= p->Domain[0];
+- py *= p->Domain[1];
+- pz *= p->Domain[2];
++ px = fclamp(Input[0]) * p->Domain[0];
++ py = fclamp(Input[1]) * p->Domain[1];
++ pz = fclamp(Input[2]) * p->Domain[2];
+
+ x0 = (int) _cmsQuickFloor(px); rx = (px - (cmsFloat32Number) x0);
+ y0 = (int) _cmsQuickFloor(py); ry = (py - (cmsFloat32Number) y0);
+@@ -844,7 +830,7 @@
+ register cmsUInt16Number Output[],
+ register const cmsInterpParams* p16)
+ {
+- const cmsUInt16Number* LutTable = (cmsUInt16Number*) p16 -> Table;
++ const cmsUInt16Number* LutTable;
+ cmsS15Fixed16Number fk;
+ cmsS15Fixed16Number k0, rk;
+ int K0, K1;
+@@ -1039,8 +1025,7 @@
+ cmsFloat32Number Tmp1[MAX_STAGE_CHANNELS], Tmp2[MAX_STAGE_CHANNELS];
+ cmsInterpParams p1;
+
+-
+- pk = Input[0] * p->Domain[0];
++ pk = fclamp(Input[0]) * p->Domain[0];
+ k0 = _cmsQuickFloor(pk);
+ rest = pk - (cmsFloat32Number) k0;
+
+@@ -1127,7 +1112,7 @@
+ cmsFloat32Number Tmp1[MAX_STAGE_CHANNELS], Tmp2[MAX_STAGE_CHANNELS];
+ cmsInterpParams p1;
+
+- pk = Input[0] * p->Domain[0];
++ pk = fclamp(Input[0]) * p->Domain[0];
+ k0 = _cmsQuickFloor(pk);
+ rest = pk - (cmsFloat32Number) k0;
+
+@@ -1214,7 +1199,7 @@
+ cmsFloat32Number Tmp1[MAX_STAGE_CHANNELS], Tmp2[MAX_STAGE_CHANNELS];
+ cmsInterpParams p1;
+
+- pk = Input[0] * p->Domain[0];
++ pk = fclamp(Input[0]) * p->Domain[0];
+ k0 = _cmsQuickFloor(pk);
+ rest = pk - (cmsFloat32Number) k0;
+
+@@ -1299,7 +1284,7 @@
+ cmsFloat32Number Tmp1[MAX_STAGE_CHANNELS], Tmp2[MAX_STAGE_CHANNELS];
+ cmsInterpParams p1;
+
+- pk = Input[0] * p->Domain[0];
++ pk = fclamp(Input[0]) * p->Domain[0];
+ k0 = _cmsQuickFloor(pk);
+ rest = pk - (cmsFloat32Number) k0;
+
+@@ -1384,7 +1369,7 @@
+ cmsFloat32Number Tmp1[MAX_STAGE_CHANNELS], Tmp2[MAX_STAGE_CHANNELS];
+ cmsInterpParams p1;
+
+- pk = Input[0] * p->Domain[0];
++ pk = fclamp(Input[0]) * p->Domain[0];
+ k0 = _cmsQuickFloor(pk);
+ rest = pk - (cmsFloat32Number) k0;
+
--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-09-06 11:29:02.000000000 -0700
-+++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-12-01 11:14:30.000000000 -0800
-@@ -1074,6 +1074,27 @@
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2014-04-20 12:39:16.000000000 -0700
+@@ -154,7 +154,6 @@
+ return iohandler;
+
+ Error:
+- if (fm) _cmsFree(ContextID, fm);
+ if (iohandler) _cmsFree(ContextID, iohandler);
+ return NULL;
+
+@@ -223,12 +222,17 @@
+
+ // Writes data to memory, also keeps used space for further reference.
+ static
+-cmsBool MemoryWrite(struct _cms_io_handler* iohandler, cmsUInt32Number size, const void *Ptr)
++cmsBool MemoryWrite(struct _cms_io_handler* iohandler, cmsUInt32Number size, const void *Ptr)
+ {
+ FILEMEM* ResData = (FILEMEM*) iohandler ->stream;
+
+ if (ResData == NULL) return FALSE; // Housekeeping
+
++ // Check for available space. Clip.
++ if (iohandler ->UsedSpace + size > ResData->Size) {
++ size = ResData ->Size - iohandler ->UsedSpace;
++ }
++
+ if (size == 0) return TRUE; // Write zero bytes is ok, but does nothing
+
+ memmove(ResData ->Block + ResData ->Pointer, Ptr, size);
+@@ -389,13 +393,15 @@
+ return TRUE;
}
+-// Create a iohandler for disk based files. if FileName is NULL, then 'stream' member is also set
+-// to NULL and no real writting is performed. This only happens in writting access mode
++// Create a iohandler for disk based files.
+ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromFile(cmsContext ContextID, const char* FileName, const char* AccessMode)
+ {
+ cmsIOHANDLER* iohandler = NULL;
+ FILE* fm = NULL;
+
++ _cmsAssert(FileName != NULL);
++ _cmsAssert(AccessMode != NULL);
++
+ iohandler = (cmsIOHANDLER*) _cmsMallocZero(ContextID, sizeof(cmsIOHANDLER));
+ if (iohandler == NULL) return NULL;
+
+@@ -432,11 +438,8 @@
+ iohandler ->UsedSpace = 0;
+
+ // Keep track of the original file
+- if (FileName != NULL) {
+-
+- strncpy(iohandler -> PhysicalFile, FileName, sizeof(iohandler -> PhysicalFile)-1);
+- iohandler -> PhysicalFile[sizeof(iohandler -> PhysicalFile)-1] = 0;
+- }
++ strncpy(iohandler -> PhysicalFile, FileName, sizeof(iohandler -> PhysicalFile)-1);
++ iohandler -> PhysicalFile[sizeof(iohandler -> PhysicalFile)-1] = 0;
+
+ iohandler ->Read = FileRead;
+ iohandler ->Seek = FileSeek;
+@@ -616,6 +619,31 @@
+ return _cmsSearchTag(Icc, sig, FALSE) >= 0;
+ }
+
++/*
++ * Enforces that the profile version is per. spec.
++ * Operates on the big endian bytes from the profile.
++ * Called before converting to platform endianness.
++ * Byte 0 is BCD major version, so max 9.
++ * Byte 1 is 2 BCD digits, one per nibble.
++ * Reserved bytes 2 & 3 must be 0.
++ */
++static cmsUInt32Number _validatedVersion(cmsUInt32Number DWord)
++{
++ cmsUInt8Number* pByte = (cmsUInt8Number*)&DWord;
++ cmsUInt8Number temp1;
++ cmsUInt8Number temp2;
++
++ if (*pByte > 0x09) *pByte = (cmsUInt8Number)9;
++ temp1 = *(pByte+1) & 0xf0;
++ temp2 = *(pByte+1) & 0x0f;
++ if (temp1 > 0x90) temp1 = 0x90;
++ if (temp2 > 9) temp2 = 0x09;
++ *(pByte+1) = (cmsUInt8Number)(temp1 | temp2);
++ *(pByte+2) = (cmsUInt8Number)0;
++ *(pByte+3) = (cmsUInt8Number)0;
++
++ return DWord;
++}
+
+ // Read profile header and validate it
+ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc)
+@@ -643,12 +671,15 @@
+ Icc -> DeviceClass = (cmsProfileClassSignature) _cmsAdjustEndianess32(Header.deviceClass);
+ Icc -> ColorSpace = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.colorSpace);
+ Icc -> PCS = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.pcs);
++
+ Icc -> RenderingIntent = _cmsAdjustEndianess32(Header.renderingIntent);
+ Icc -> flags = _cmsAdjustEndianess32(Header.flags);
+ Icc -> manufacturer = _cmsAdjustEndianess32(Header.manufacturer);
+ Icc -> model = _cmsAdjustEndianess32(Header.model);
++ Icc -> creator = _cmsAdjustEndianess32(Header.creator);
++
+ _cmsAdjustEndianess64(&Icc -> attributes, &Header.attributes);
+- Icc -> Version = _cmsAdjustEndianess32(Header.version);
++ Icc -> Version = _cmsAdjustEndianess32(_validatedVersion(Header.version));
+
+ // Get size as reported in header
+ HeaderSize = _cmsAdjustEndianess32(Header.size);
+@@ -815,28 +846,33 @@
+ cmsUInt32Number CMSEXPORT cmsGetHeaderManufacturer(cmsHPROFILE hProfile)
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+- return (cmsUInt32Number) Icc ->manufacturer;
++ return Icc ->manufacturer;
+ }
+
+ void CMSEXPORT cmsSetHeaderManufacturer(cmsHPROFILE hProfile, cmsUInt32Number manufacturer)
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+- Icc -> manufacturer = (cmsUInt32Number) manufacturer;
++ Icc -> manufacturer = manufacturer;
++}
++
++cmsUInt32Number CMSEXPORT cmsGetHeaderCreator(cmsHPROFILE hProfile)
++{
++ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
++ return Icc ->creator;
+ }
+
+ cmsUInt32Number CMSEXPORT cmsGetHeaderModel(cmsHPROFILE hProfile)
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+- return (cmsUInt32Number) Icc ->model;
++ return Icc ->model;
+ }
+
+ void CMSEXPORT cmsSetHeaderModel(cmsHPROFILE hProfile, cmsUInt32Number model)
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+- Icc -> model = (cmsUInt32Number) model;
++ Icc -> model = model;
+ }
+
+-
+ void CMSEXPORT cmsGetHeaderAttributes(cmsHPROFILE hProfile, cmsUInt64Number* Flags)
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+@@ -1073,7 +1109,33 @@
+ return cmsOpenProfileFromMemTHR(NULL, MemPtr, dwSize);
+ }
+static
+cmsBool SanityCheck(_cmsICCPROFILE* profile)
+{
-+ cmsIOHANDLER* io = profile->IOhandler;
++ cmsIOHANDLER* io;
++
++ if (!profile) {
++ return FALSE;
++ }
++
++ io = profile->IOhandler;
+ if (!io) {
+ return FALSE;
+ }
@@ -63291,33 +52381,3374 @@
+ {
+ return FALSE;
+ }
-+
+
+ return TRUE;
+}
// Dump tag contents. If the profile is being modified, untouched tags are copied from FileOrig
static
-@@ -1087,6 +1108,7 @@
+@@ -1085,12 +1147,13 @@
+ cmsIOHANDLER* io = Icc ->IOhandler;
+ cmsTagDescriptor* TagDescriptor;
cmsTagTypeSignature TypeBase;
++ cmsTagTypeSignature Type;
cmsTagTypeHandler* TypeHandler;
-
-+ if (!SanityCheck(FileOrig)) return FALSE;
+-
++ cmsFloat64Number Version = cmsGetProfileVersion((cmsHPROFILE) Icc);
++ cmsTagTypeHandler LocalTypeHandler;
for (i=0; i < Icc -> TagCount; i++) {
-@@ -1292,8 +1314,8 @@
- // Should we just calculate the needed space?
+-
+ if (Icc ->TagNames[i] == 0) continue;
+
+ // Linked tags are not written
+@@ -1104,7 +1167,7 @@
+
+ // Reach here if we are copying a tag from a disk-based ICC profile which has not been modified by user.
+ // In this case a blind copy of the block data is performed
+- if (FileOrig != NULL && Icc -> TagOffsets[i]) {
++ if (SanityCheck(FileOrig) && Icc -> TagOffsets[i]) {
+
+ cmsUInt32Number TagSize = FileOrig -> TagSizes[i];
+ cmsUInt32Number TagOffset = FileOrig -> TagOffsets[i];
+@@ -1142,7 +1205,16 @@
+ TagDescriptor = _cmsGetTagDescriptor(Icc -> TagNames[i]);
+ if (TagDescriptor == NULL) continue; // Unsupported, ignore it
+
+- TypeHandler = Icc ->TagTypeHandlers[i];
++ if (TagDescriptor ->DecideType != NULL) {
++
++ Type = TagDescriptor ->DecideType(Version, Data);
++ }
++ else {
++
++ Type = TagDescriptor ->SupportedTypes[0];
++ }
++
++ TypeHandler = _cmsGetTagTypeHandler(Type);
+
+ if (TypeHandler == NULL) {
+ cmsSignalError(Icc ->ContextID, cmsERROR_INTERNAL, "(Internal) no handler for tag %x", Icc -> TagNames[i]);
+@@ -1153,9 +1225,10 @@
+ if (!_cmsWriteTypeBase(io, TypeBase))
+ return FALSE;
+
+- TypeHandler ->ContextID = Icc ->ContextID;
+- TypeHandler ->ICCVersion = Icc ->Version;
+- if (!TypeHandler ->WritePtr(TypeHandler, io, Data, TagDescriptor ->ElemCount)) {
++ LocalTypeHandler = *TypeHandler;
++ LocalTypeHandler.ContextID = Icc ->ContextID;
++ LocalTypeHandler.ICCVersion = Icc ->Version;
++ if (!LocalTypeHandler.WritePtr(&LocalTypeHandler, io, Data, TagDescriptor ->ElemCount)) {
+
+ char String[5];
+
+@@ -1293,7 +1366,7 @@
if (MemPtr == NULL) {
-- *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
+ *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
- return TRUE;
-+ *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
-+ return (*BytesNeeded == 0 ? FALSE : TRUE);
++ return (*BytesNeeded == 0 ? FALSE : TRUE);
}
// That is a real write operation
+@@ -1331,10 +1404,11 @@
+ cmsTagTypeHandler* TypeHandler = Icc ->TagTypeHandlers[i];
+
+ if (TypeHandler != NULL) {
++ cmsTagTypeHandler LocalTypeHandler = *TypeHandler;
+
+- TypeHandler ->ContextID = Icc ->ContextID; // As an additional parameters
+- TypeHandler ->ICCVersion = Icc ->Version;
+- TypeHandler ->FreePtr(TypeHandler, Icc -> TagPtrs[i]);
++ LocalTypeHandler.ContextID = Icc ->ContextID; // As an additional parameters
++ LocalTypeHandler.ICCVersion = Icc ->Version;
++ LocalTypeHandler.FreePtr(&LocalTypeHandler, Icc -> TagPtrs[i]);
+ }
+ else
+ _cmsFree(Icc ->ContextID, Icc ->TagPtrs[i]);
+@@ -1378,6 +1452,7 @@
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ cmsIOHANDLER* io = Icc ->IOhandler;
+ cmsTagTypeHandler* TypeHandler;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor;
+ cmsTagTypeSignature BaseType;
+ cmsUInt32Number Offset, TagSize;
+@@ -1401,7 +1476,7 @@
+
+ // Seek to its location
+ if (!io -> Seek(io, Offset))
+- return NULL;
++ return NULL;
+
+ // Search for support on this tag
+ TagDescriptor = _cmsGetTagDescriptor(sig);
+@@ -1418,14 +1493,15 @@
+ // Get type handler
+ TypeHandler = _cmsGetTagTypeHandler(BaseType);
+ if (TypeHandler == NULL) return NULL;
++ LocalTypeHandler = *TypeHandler;
+
+
+ // Read the tag
+ Icc -> TagTypeHandlers[n] = TypeHandler;
+
+- TypeHandler ->ContextID = Icc ->ContextID;
+- TypeHandler ->ICCVersion = Icc ->Version;
+- Icc -> TagPtrs[n] = TypeHandler ->ReadPtr(TypeHandler, io, &ElemCount, TagSize);
++ LocalTypeHandler.ContextID = Icc ->ContextID;
++ LocalTypeHandler.ICCVersion = Icc ->Version;
++ Icc -> TagPtrs[n] = LocalTypeHandler.ReadPtr(&LocalTypeHandler, io, &ElemCount, TagSize);
+
+ // The tag type is supported, but something wrong happend and we cannot read the tag.
+ // let know the user about this (although it is just a warning)
+@@ -1446,7 +1522,7 @@
+
+ _cmsTagSignature2String(String, sig);
+ cmsSignalError(Icc ->ContextID, cmsERROR_CORRUPTION_DETECTED, "'%s' Inconsistent number of items: expected %d, got %d",
+- String, TagDescriptor ->ElemCount, ElemCount);
++ String, TagDescriptor ->ElemCount, ElemCount);
+ }
+
+
+@@ -1478,6 +1554,7 @@
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ cmsTagTypeHandler* TypeHandler = NULL;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor = NULL;
+ cmsTagTypeSignature Type;
+ int i;
+@@ -1508,9 +1585,10 @@
+
+ if (TypeHandler != NULL) {
+
+- TypeHandler ->ContextID = Icc ->ContextID; // As an additional parameter
+- TypeHandler ->ICCVersion = Icc ->Version;
+- TypeHandler->FreePtr(TypeHandler, Icc -> TagPtrs[i]);
++ LocalTypeHandler = *TypeHandler;
++ LocalTypeHandler.ContextID = Icc ->ContextID; // As an additional parameter
++ LocalTypeHandler.ICCVersion = Icc ->Version;
++ LocalTypeHandler.FreePtr(&LocalTypeHandler, Icc -> TagPtrs[i]);
+ }
+ }
+ }
+@@ -1549,7 +1627,7 @@
+ // Let the tag descriptor to decide the type base on depending on
+ // the data. This is useful for example on parametric curves, where
+ // curves specified by a table cannot be saved as parametric and needs
+- // to be revented to single v2-curves, even on v4 profiles.
++ // to be casted to single v2-curves, even on v4 profiles.
+
+ Type = TagDescriptor ->DecideType(Version, data);
+ }
+@@ -1587,9 +1665,10 @@
+ Icc ->TagSizes[i] = 0;
+ Icc ->TagOffsets[i] = 0;
+
+- TypeHandler ->ContextID = Icc ->ContextID;
+- TypeHandler ->ICCVersion = Icc ->Version;
+- Icc ->TagPtrs[i] = TypeHandler ->DupPtr(TypeHandler, data, TagDescriptor ->ElemCount);
++ LocalTypeHandler = *TypeHandler;
++ LocalTypeHandler.ContextID = Icc ->ContextID;
++ LocalTypeHandler.ICCVersion = Icc ->Version;
++ Icc ->TagPtrs[i] = LocalTypeHandler.DupPtr(&LocalTypeHandler, data, TagDescriptor ->ElemCount);
+
+ if (Icc ->TagPtrs[i] == NULL) {
+
+@@ -1616,6 +1695,7 @@
+ int i;
+ cmsIOHANDLER* MemIO;
+ cmsTagTypeHandler* TypeHandler = NULL;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor = NULL;
+ cmsUInt32Number rc;
+ cmsUInt32Number Offset, TagSize;
+@@ -1631,15 +1711,16 @@
+ Offset = Icc ->TagOffsets[i];
+ TagSize = Icc ->TagSizes[i];
+
+-
+ // read the data directly, don't keep copy
+ if (data != NULL) {
+
+ if (BufferSize < TagSize)
+- TagSize = BufferSize;
++ TagSize = BufferSize;
+
+ if (!Icc ->IOhandler ->Seek(Icc ->IOhandler, Offset)) return 0;
+ if (!Icc ->IOhandler ->Read(Icc ->IOhandler, data, 1, TagSize)) return 0;
++
++ return TagSize;
+ }
+
+ return Icc ->TagSizes[i];
+@@ -1653,9 +1734,11 @@
+
+ TagSize = Icc ->TagSizes[i];
+ if (BufferSize < TagSize)
+- TagSize = BufferSize;
++ TagSize = BufferSize;
+
+ memmove(data, Icc ->TagPtrs[i], TagSize);
++
++ return TagSize;
+ }
+
+ return Icc ->TagSizes[i];
+@@ -1671,7 +1754,7 @@
+ if (data == NULL) {
+ MemIO = cmsOpenIOhandlerFromNULL(cmsGetProfileContextID(hProfile));
+ } else{
+- MemIO = cmsOpenIOhandlerFromMem(cmsGetProfileContextID(hProfile), data, BufferSize, "w");
++ MemIO = cmsOpenIOhandlerFromMem(cmsGetProfileContextID(hProfile), data, BufferSize, "w");
+ }
+ if (MemIO == NULL) return 0;
+
+@@ -1679,20 +1762,22 @@
+ TypeHandler = Icc ->TagTypeHandlers[i];
+ TagDescriptor = _cmsGetTagDescriptor(sig);
+ if (TagDescriptor == NULL) {
+- cmsCloseIOhandler(MemIO);
+- return 0;
++ cmsCloseIOhandler(MemIO);
++ return 0;
+ }
+
++ // FIXME: No handling for TypeHandler == NULL here?
+ // Serialize
+- TypeHandler ->ContextID = Icc ->ContextID;
+- TypeHandler ->ICCVersion = Icc ->Version;
++ LocalTypeHandler = *TypeHandler;
++ LocalTypeHandler.ContextID = Icc ->ContextID;
++ LocalTypeHandler.ICCVersion = Icc ->Version;
+
+ if (!_cmsWriteTypeBase(MemIO, TypeHandler ->Signature)) {
+ cmsCloseIOhandler(MemIO);
+ return 0;
+ }
+
+- if (!TypeHandler ->WritePtr(TypeHandler, MemIO, Object, TagDescriptor ->ElemCount)) {
++ if (!LocalTypeHandler.WritePtr(&LocalTypeHandler, MemIO, Object, TagDescriptor ->ElemCount)) {
+ cmsCloseIOhandler(MemIO);
+ return 0;
+ }
+@@ -1730,7 +1815,7 @@
+ // Using this function you can collapse several tag entries to the same block in the profile
+ cmsBool CMSEXPORT cmsLinkTag(cmsHPROFILE hProfile, cmsTagSignature sig, cmsTagSignature dest)
+ {
+- _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
++ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ int i;
+
+ if (!_cmsNewTag(Icc, sig, &i)) return FALSE;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2014-04-20 12:39:16.000000000 -0700
+@@ -129,7 +129,6 @@
+ Tag = (cmsMAT3*) cmsReadTag(hProfile, cmsSigChromaticAdaptationTag);
+
+ if (Tag != NULL) {
+-
+ *Dest = *Tag;
+ return TRUE;
+ }
+@@ -193,7 +192,8 @@
+ if (GrayTRC == NULL) return NULL;
+
+ Lut = cmsPipelineAlloc(ContextID, 1, 3);
+- if (Lut == NULL) return NULL;
++ if (Lut == NULL)
++ goto Error;
+
+ if (cmsGetPCS(hProfile) == cmsSigLabData) {
+
+@@ -204,28 +204,35 @@
+
+ EmptyTab = cmsBuildTabulatedToneCurve16(ContextID, 2, Zero);
+
+- if (EmptyTab == NULL) {
+-
+- cmsPipelineFree(Lut);
+- return NULL;
+- }
++ if (EmptyTab == NULL)
++ goto Error;
+
+ LabCurves[0] = GrayTRC;
+ LabCurves[1] = EmptyTab;
+ LabCurves[2] = EmptyTab;
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 1, OneToThreeInputMatrix, NULL));
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, LabCurves));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 1, OneToThreeInputMatrix, NULL)) ||
++ !cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, LabCurves))) {
++ cmsFreeToneCurve(EmptyTab);
++ goto Error;
++ }
+
+ cmsFreeToneCurve(EmptyTab);
+
+ }
+ else {
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 1, &GrayTRC));
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 1, GrayInputMatrix, NULL));
++
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 1, &GrayTRC)) ||
++ !cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 1, GrayInputMatrix, NULL)))
++ goto Error;
+ }
+
+ return Lut;
++
++Error:
++ cmsFreeToneCurve(GrayTRC);
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // RGB Matrix shaper
+@@ -259,49 +266,31 @@
+ Lut = cmsPipelineAlloc(ContextID, 3, 3);
+ if (Lut != NULL) {
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, Shapes));
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 3, (cmsFloat64Number*) &Mat, NULL));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, Shapes)) ||
++ !cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 3, (cmsFloat64Number*) &Mat, NULL)))
++ goto Error;
+
+ // Note that it is certainly possible a single profile would have a LUT based
+ // tag for output working in lab and a matrix-shaper for the fallback cases.
+ // This is not allowed by the spec, but this code is tolerant to those cases
+ if (cmsGetPCS(hProfile) == cmsSigLabData) {
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocXYZ2Lab(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocXYZ2Lab(ContextID)))
++ goto Error;
+ }
+
+ }
+
+ return Lut;
++
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+
+
+ // Read the DToAX tag, adjusting the encoding of Lab or XYZ if neded
+-/*static
+-cmsPipeline* _cmsReadFloatInputTag(cmsHPROFILE hProfile, cmsTagSignature tagFloat)
+-{
+- cmsContext ContextID = cmsGetProfileContextID(hProfile);
+- cmsPipeline* Lut = cmsPipelineDup((cmsPipeline*) cmsReadTag(hProfile, tagFloat));
+- cmsColorSpaceSignature spc = cmsGetColorSpace(hProfile);
+-
+- if (Lut == NULL) return NULL;
+-
+- // If PCS is Lab or XYZ, the floating point tag is accepting data in the space encoding,
+- // and since the formatter has already accomodated to 0..1.0, we should undo this change
+- if ( spc == cmsSigLabData)
+- {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID));
+- }
+- else
+- if (spc == cmsSigXYZData)
+- {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID));
+- }
+-
+- return Lut;
+-}
+-*/
+ static
+ cmsPipeline* _cmsReadFloatInputTag(cmsHPROFILE hProfile, cmsTagSignature tagFloat)
+ {
+@@ -316,23 +305,31 @@
+ // these need to be normalized into the appropriate ranges (Lab = 100,0,0, XYZ=1.0,1.0,1.0)
+ if ( spc == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID)))
++ goto Error;
+ }
+ else if (spc == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID)))
++ goto Error;
+ }
+
+ if ( PCS == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID)))
++ goto Error;
+ }
+ else if( PCS == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID)))
++ goto Error;
+ }
+
+ return Lut;
++
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+
+@@ -359,8 +356,11 @@
+ return NULL;
+ }
+
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, TRUE));
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, TRUE)) ||
++ !cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID))) {
++ cmsPipelineFree(Lut);
++ return NULL;
++ }
+ return Lut;
+ }
+
+@@ -395,12 +395,18 @@
+ return Lut;
+
+ // If the input is Lab, add also a conversion at the begin
+- if (cmsGetColorSpace(hProfile) == cmsSigLabData)
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID));
++ if (cmsGetColorSpace(hProfile) == cmsSigLabData &&
++ !cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID)))
++ goto Error;
+
+ // Add a matrix for conversion V2 to V4 Lab PCS
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID)))
++ goto Error;
++
+ return Lut;
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // Lut was not found, try to create a matrix-shaper
+@@ -445,19 +451,25 @@
+
+ if (cmsGetPCS(hProfile) == cmsSigLabData) {
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 1, 3, PickLstarMatrix, NULL));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 1, 3, PickLstarMatrix, NULL)))
++ goto Error;
+ }
+ else {
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 1, 3, PickYMatrix, NULL));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 1, 3, PickYMatrix, NULL)))
++ goto Error;
+ }
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 1, &RevGrayTRC));
+- cmsFreeToneCurve(RevGrayTRC);
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 1, &RevGrayTRC)))
++ goto Error;
+
++ cmsFreeToneCurve(RevGrayTRC);
+ return Lut;
+-}
+-
+
++Error:
++ cmsFreeToneCurve(RevGrayTRC);
++ cmsPipelineFree(Lut);
++ return NULL;
++}
+
+
+ static
+@@ -506,15 +518,21 @@
+ // This is not allowed by the spec, but this code is tolerant to those cases
+ if (cmsGetPCS(hProfile) == cmsSigLabData) {
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLab2XYZ(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLab2XYZ(ContextID)))
++ goto Error;
+ }
+
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 3, (cmsFloat64Number*) &Inv, NULL));
+- cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, InvShapes));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocMatrix(ContextID, 3, 3, (cmsFloat64Number*) &Inv, NULL)) ||
++ !cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 3, InvShapes)))
++ goto Error;
+ }
+
+ cmsFreeToneCurveTriple(InvShapes);
+ return Lut;
++Error:
++ cmsFreeToneCurveTriple(InvShapes);
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+
+@@ -540,30 +558,6 @@
+
+
+ // Read the DToAX tag, adjusting the encoding of Lab or XYZ if neded
+-/*static
+-cmsPipeline* _cmsReadFloatOutputTag(cmsHPROFILE hProfile, cmsTagSignature tagFloat)
+-{
+- cmsContext ContextID = cmsGetProfileContextID(hProfile);
+- cmsPipeline* Lut = cmsPipelineDup((cmsPipeline*) cmsReadTag(hProfile, tagFloat));
+- cmsColorSpaceSignature PCS = cmsGetPCS(hProfile);
+-
+- if (Lut == NULL) return NULL;
+-
+- // If PCS is Lab or XYZ, the floating point tag is accepting data in the space encoding,
+- // and since the formatter has already accomodated to 0..1.0, we should undo this change
+- if ( PCS == cmsSigLabData)
+- {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID));
+- }
+- else
+- if (PCS == cmsSigXYZData)
+- {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID));
+- }
+-
+- return Lut;
+-}*/
+-
+ static
+ cmsPipeline* _cmsReadFloatOutputTag(cmsHPROFILE hProfile, cmsTagSignature tagFloat)
+ {
+@@ -578,25 +572,33 @@
+ // and since the formatter has already accomodated to 0..1.0, we should undo this change
+ if ( PCS == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID)))
++ goto Error;
+ }
+ else
+ if (PCS == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID)))
++ goto Error;
+ }
+
+ // the output can be Lab or XYZ, in which case normalisation is needed on the end of the pipeline
+ if ( dataSpace == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID)))
++ goto Error;
+ }
+- else if ( dataSpace == cmsSigXYZData)
++ else if (dataSpace == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID)))
++ goto Error;
+ }
+
+ return Lut;
++
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // Create an output MPE LUT from agiven profile. Version mismatches are handled here
+@@ -636,30 +638,35 @@
+ // Now it is time for a controversial stuff. I found that for 3D LUTS using
+ // Lab used as indexer space, trilinear interpolation should be used
+ if (cmsGetPCS(hProfile) == cmsSigLabData)
+- ChangeInterpolationToTrilinear(Lut);
++ ChangeInterpolationToTrilinear(Lut);
+
+ // We need to adjust data only for Lab and Lut16 type
+ if (OriginalType != cmsSigLut16Type || cmsGetPCS(hProfile) != cmsSigLabData)
+ return Lut;
+
+ // Add a matrix for conversion V4 to V2 Lab PCS
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID)))
++ goto Error;
+
+ // If the output is Lab, add also a conversion at the end
+ if (cmsGetColorSpace(hProfile) == cmsSigLabData)
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID)))
++ goto Error;
+
+ return Lut;
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // Lut not found, try to create a matrix-shaper
+
+ // Check if this is a grayscale profile.
+- if (cmsGetColorSpace(hProfile) == cmsSigGrayData) {
++ if (cmsGetColorSpace(hProfile) == cmsSigGrayData) {
+
+- // if so, build appropiate conversion tables.
+- // The tables are the PCS iluminant, scaled across GrayTRC
+- return BuildGrayOutputPipeline(hProfile);
++ // if so, build appropiate conversion tables.
++ // The tables are the PCS iluminant, scaled across GrayTRC
++ return BuildGrayOutputPipeline(hProfile);
+ }
+
+ // Not gray, create a normal matrix-shaper, which only operates in XYZ space
+@@ -681,25 +688,32 @@
+
+ if (spc == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID)))
++ goto Error;
+ }
+ else
+ if (spc == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToXyzFloat(ContextID)))
++ goto Error;
+ }
+
+ if (PCS == cmsSigLabData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID)))
++ goto Error;
+ }
+ else
+ if (PCS == cmsSigXYZData)
+ {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID)))
++ goto Error;
+ }
+
+- return Lut;
++ return Lut;
++Error:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // This one includes abstract profiles as well. Matrix-shaper cannot be obtained on that device class. The
+@@ -721,15 +735,21 @@
+ if (nc == NULL) return NULL;
+
+ Lut = cmsPipelineAlloc(ContextID, 0, 0);
+- if (Lut == NULL) {
+- cmsFreeNamedColorList(nc);
+- return NULL;
+- }
++ if (Lut == NULL)
++ goto Error;
++
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, FALSE)))
++ goto Error;
+
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, FALSE));
+ if (cmsGetColorSpace(hProfile) == cmsSigLabData)
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID)))
++ goto Error;
++
+ return Lut;
++Error:
++ cmsPipelineFree(Lut);
++ cmsFreeNamedColorList(nc);
++ return NULL;
+ }
+
+ if (cmsIsTag(hProfile, tagFloat)) { // Float tag takes precedence
+@@ -760,10 +780,10 @@
+ Lut = cmsPipelineDup(Lut);
+ if (Lut == NULL) return NULL;
+
+- // Now it is time for a controversial stuff. I found that for 3D LUTS using
+- // Lab used as indexer space, trilinear interpolation should be used
++ // Now it is time for a controversial stuff. I found that for 3D LUTS using
++ // Lab used as indexer space, trilinear interpolation should be used
+ if (cmsGetColorSpace(hProfile) == cmsSigLabData)
+- ChangeInterpolationToTrilinear(Lut);
++ ChangeInterpolationToTrilinear(Lut);
+
+ // After reading it, we have info about the original type
+ OriginalType = _cmsGetTagTrueType(hProfile, tag16);
+@@ -774,16 +794,20 @@
+ // Here it is possible to get Lab on both sides
+
+ if (cmsGetPCS(hProfile) == cmsSigLabData) {
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID));
++ if(!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID)))
++ goto Error2;
+ }
+
+ if (cmsGetColorSpace(hProfile) == cmsSigLabData) {
+- cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID));
++ if(!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID)))
++ goto Error2;
+ }
+
+ return Lut;
+
+-
++Error2:
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+ // ---------------------------------------------------------------------------------------------------------------
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2014-04-20 12:39:16.000000000 -0700
+@@ -264,10 +264,10 @@
+ if (NewElem ->TheCurves != NULL) {
+ for (i=0; i < NewElem ->nCurves; i++) {
+ if (NewElem ->TheCurves[i])
+- cmsFreeToneCurve(Data ->TheCurves[i]);
++ cmsFreeToneCurve(NewElem ->TheCurves[i]);
+ }
+ }
+- _cmsFree(mpe ->ContextID, Data ->TheCurves);
++ _cmsFree(mpe ->ContextID, NewElem ->TheCurves);
+ _cmsFree(mpe ->ContextID, NewElem);
+ return NULL;
+ }
+@@ -392,6 +392,8 @@
+ void MatrixElemTypeFree(cmsStage* mpe)
+ {
+ _cmsStageMatrixData* Data = (_cmsStageMatrixData*) mpe ->Data;
++ if (Data == NULL)
++ return;
+ if (Data ->Double)
+ _cmsFree(mpe ->ContextID, Data ->Double);
+
+@@ -526,10 +528,15 @@
+
+ if (Data ->Tab.T) {
+
+- if (Data ->HasFloatValues)
++ if (Data ->HasFloatValues) {
+ NewElem ->Tab.TFloat = (cmsFloat32Number*) _cmsDupMem(mpe ->ContextID, Data ->Tab.TFloat, Data ->nEntries * sizeof (cmsFloat32Number));
+- else
++ if (NewElem ->Tab.TFloat == NULL)
++ goto Error;
++ } else {
+ NewElem ->Tab.T = (cmsUInt16Number*) _cmsDupMem(mpe ->ContextID, Data ->Tab.T, Data ->nEntries * sizeof (cmsUInt16Number));
++ if (NewElem ->Tab.TFloat == NULL)
++ goto Error;
++ }
+ }
+
+ NewElem ->Params = _cmsComputeInterpParamsEx(mpe ->ContextID,
+@@ -538,8 +545,14 @@
+ Data ->Params ->nOutputs,
+ NewElem ->Tab.T,
+ Data ->Params ->dwFlags);
+-
+- return (void*) NewElem;
++ if (NewElem->Params != NULL)
++ return (void*) NewElem;
++ Error:
++ if (NewElem->Tab.T)
++ // This works for both types
++ _cmsFree(mpe ->ContextID, NewElem -> Tab.T);
++ _cmsFree(mpe ->ContextID, NewElem);
++ return NULL;
+ }
+
+
+@@ -636,7 +649,6 @@
+ for (i=0; i < MAX_INPUT_DIMENSIONS; i++)
+ Dimensions[i] = nGridPoints;
+
+-
+ return cmsStageAllocCLut16bitGranular(ContextID, Dimensions, inputChan, outputChan, Table);
+ }
+
+@@ -706,15 +718,12 @@
+ }
+ }
+
+-
+ NewElem ->Params = _cmsComputeInterpParamsEx(ContextID, clutPoints, inputChan, outputChan, NewElem ->Tab.TFloat, CMS_LERP_FLAGS_FLOAT);
+ if (NewElem ->Params == NULL) {
+ cmsStageFree(NewMPE);
+ return NULL;
+ }
+
+-
+-
+ return NewMPE;
+ }
+
+@@ -772,7 +781,7 @@
+ int i, t, nTotalPoints, index, rest;
+ int nInputs, nOutputs;
+ cmsUInt32Number* nSamples;
+- cmsUInt16Number In[cmsMAXCHANNELS], Out[MAX_STAGE_CHANNELS];
++ cmsUInt16Number In[MAX_INPUT_DIMENSIONS+1], Out[MAX_STAGE_CHANNELS];
+ _cmsStageCLutData* clut;
+
+ if (mpe == NULL) return FALSE;
+@@ -785,7 +794,9 @@
+ nInputs = clut->Params ->nInputs;
+ nOutputs = clut->Params ->nOutputs;
+
+- if (nInputs >= cmsMAXCHANNELS) return FALSE;
++ if (nInputs <= 0) return FALSE;
++ if (nOutputs <= 0) return FALSE;
++ if (nInputs > MAX_INPUT_DIMENSIONS) return FALSE;
+ if (nOutputs >= MAX_STAGE_CHANNELS) return FALSE;
+
+ nTotalPoints = CubeSize(nSamples, nInputs);
+@@ -832,14 +843,16 @@
+ int i, t, nTotalPoints, index, rest;
+ int nInputs, nOutputs;
+ cmsUInt32Number* nSamples;
+- cmsFloat32Number In[cmsMAXCHANNELS], Out[MAX_STAGE_CHANNELS];
++ cmsFloat32Number In[MAX_INPUT_DIMENSIONS+1], Out[MAX_STAGE_CHANNELS];
+ _cmsStageCLutData* clut = (_cmsStageCLutData*) mpe->Data;
+
+ nSamples = clut->Params ->nSamples;
+ nInputs = clut->Params ->nInputs;
+ nOutputs = clut->Params ->nOutputs;
+
+- if (nInputs >= cmsMAXCHANNELS) return FALSE;
++ if (nInputs <= 0) return FALSE;
++ if (nOutputs <= 0) return FALSE;
++ if (nInputs > MAX_INPUT_DIMENSIONS) return FALSE;
+ if (nOutputs >= MAX_STAGE_CHANNELS) return FALSE;
+
+ nTotalPoints = CubeSize(nSamples, nInputs);
+@@ -1021,7 +1034,7 @@
+ mpe = cmsStageAllocToneCurves(ContextID, 3, LabTable);
+ cmsFreeToneCurveTriple(LabTable);
+
+- if (mpe == NULL) return mpe;
++ if (mpe == NULL) return NULL;
+ mpe ->Implements = cmsSigLabV2toV4;
+ return mpe;
+ }
+@@ -1247,12 +1260,22 @@
+ NULL);
+ if (NewMPE == NULL) return NULL;
+
+- NewMPE ->Implements = mpe ->Implements;
++ NewMPE ->Implements = mpe ->Implements;
++
++ if (mpe ->DupElemPtr) {
++
++ NewMPE ->Data = mpe ->DupElemPtr(mpe);
++
++ if (NewMPE->Data == NULL) {
++
++ cmsStageFree(NewMPE);
++ return NULL;
++ }
++
++ } else {
+
+- if (mpe ->DupElemPtr)
+- NewMPE ->Data = mpe ->DupElemPtr(mpe);
+- else
+ NewMPE ->Data = NULL;
++ }
+
+ return NewMPE;
+ }
+@@ -1465,12 +1488,12 @@
+ }
+
+
+-void CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe)
++int CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe)
+ {
+ cmsStage* Anterior = NULL, *pt;
+
+- _cmsAssert(lut != NULL);
+- _cmsAssert(mpe != NULL);
++ if (lut == NULL || mpe == NULL)
++ return FALSE;
+
+ switch (loc) {
+
+@@ -1494,9 +1517,11 @@
+ }
+ break;
+ default:;
++ return FALSE;
+ }
+
+ BlessLUT(lut);
++ return TRUE;
+ }
+
+ // Unlink an element and return the pointer to it
+@@ -1558,7 +1583,7 @@
+ // Concatenate two LUT into a new single one
+ cmsBool CMSEXPORT cmsPipelineCat(cmsPipeline* l1, const cmsPipeline* l2)
+ {
+- cmsStage* mpe, *NewMPE;
++ cmsStage* mpe;
+
+ // If both LUTS does not have elements, we need to inherit
+ // the number of channels
+@@ -1573,17 +1598,12 @@
+ mpe = mpe ->Next) {
+
+ // We have to dup each element
+- NewMPE = cmsStageDup(mpe);
+-
+- if (NewMPE == NULL) {
+- return FALSE;
+- }
+-
+- cmsPipelineInsertStage(l1, cmsAT_END, NewMPE);
++ if (!cmsPipelineInsertStage(l1, cmsAT_END, cmsStageDup(mpe)))
++ return FALSE;
+ }
+
+- BlessLUT(l1);
+- return TRUE;
++ BlessLUT(l1);
++ return TRUE;
+ }
+
+
+@@ -1713,16 +1733,11 @@
+ cmsFloat32Number fx[4], x[4], xd[4], fxd[4];
+ cmsVEC3 tmp, tmp2;
+ cmsMAT3 Jacobian;
+- cmsFloat64Number LastResult[4];
+-
+
+ // Only 3->3 and 4->3 are supported
+ if (lut ->InputChannels != 3 && lut ->InputChannels != 4) return FALSE;
+ if (lut ->OutputChannels != 3) return FALSE;
+
+- // Mark result of -1
+- LastResult[0] = LastResult[1] = LastResult[2] = -1.0f;
+-
+ // Take the hint as starting point if specified
+ if (Hint == NULL) {
+
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2014-04-20 12:39:16.000000000 -0700
+@@ -338,7 +338,7 @@
+ Error:
+
+ // Free resources as something went wrong
+- if (MD5 != NULL) _cmsFree(ContextID, MD5);
++ // "MD5" cannot be other than NULL here, so no need to free it
+ if (Mem != NULL) _cmsFree(ContextID, Mem);
+ memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
+ return FALSE;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2014-04-20 12:39:16.000000000 -0700
+@@ -359,9 +359,9 @@
+ if (Best == -1)
+ Best = 0;
+
+- v = mlu ->Entries + Best;
++ v = mlu ->Entries + Best;
+
+- if (UsedLanguageCode != NULL) *UsedLanguageCode = v ->Language;
++ if (UsedLanguageCode != NULL) *UsedLanguageCode = v ->Language;
+ if (UsedCountryCode != NULL) *UsedCountryCode = v ->Country;
+
+ if (len != NULL) *len = v ->Len;
+@@ -475,6 +475,35 @@
+ }
+
+
++
++// Get the number of translations in the MLU object
++cmsUInt32Number CMSEXPORT cmsMLUtranslationsCount(const cmsMLU* mlu)
++{
++ if (mlu == NULL) return 0;
++ return mlu->UsedEntries;
++}
++
++// Get the language and country codes for a specific MLU index
++cmsBool CMSEXPORT cmsMLUtranslationsCodes(const cmsMLU* mlu,
++ cmsUInt32Number idx,
++ char LanguageCode[3],
++ char CountryCode[3])
++{
++ _cmsMLUentry *entry;
++
++ if (mlu == NULL) return FALSE;
++
++ if (idx >= (cmsUInt32Number) mlu->UsedEntries) return FALSE;
++
++ entry = &mlu->Entries[idx];
++
++ *(cmsUInt16Number *)LanguageCode = _cmsAdjustEndianess16(entry->Language);
++ *(cmsUInt16Number *)CountryCode = _cmsAdjustEndianess16(entry->Country);
++
++ return TRUE;
++}
++
++
+ // Named color lists --------------------------------------------------------------------------------------------
+
+ // Grow the list to keep at least NumElements
+@@ -517,9 +546,9 @@
+ while (v -> Allocated < n)
+ GrowNamedColorList(v);
+
+- strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix) - 1);
+- strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix) - 1);
+- v->Prefix[sizeof(v ->Prefix) - 1] = v->Suffix[sizeof(v ->Suffix) - 1] = 0;
++ strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix)-1);
++ strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix)-1);
++ v->Prefix[32] = v->Suffix[32] = 0;
+
+ v -> ColorantCount = ColorantCount;
+
+@@ -529,8 +558,9 @@
+ // Free a list
+ void CMSEXPORT cmsFreeNamedColorList(cmsNAMEDCOLORLIST* v)
+ {
++ if (v == NULL) return;
+ if (v ->List) _cmsFree(v ->ContextID, v ->List);
+- if (v) _cmsFree(v ->ContextID, v);
++ _cmsFree(v ->ContextID, v);
+ }
+
+ cmsNAMEDCOLORLIST* CMSEXPORT cmsDupNamedColorList(const cmsNAMEDCOLORLIST* v)
+@@ -576,11 +606,8 @@
+
+ if (Name != NULL) {
+
+- strncpy(NamedColorList ->List[NamedColorList ->nColors].Name, Name,
+- sizeof(NamedColorList ->List[NamedColorList ->nColors].Name) - 1);
+-
+- NamedColorList ->List[NamedColorList ->nColors].
+- Name[sizeof(NamedColorList ->List[NamedColorList ->nColors].Name) - 1] = 0;
++ strncpy(NamedColorList ->List[NamedColorList ->nColors].Name, Name, cmsMAX_PATH-1);
++ NamedColorList ->List[NamedColorList ->nColors].Name[cmsMAX_PATH-1] = 0;
+
+ }
+ else
+@@ -891,7 +918,6 @@
+ {
+ _cmsDICT* old_dict = (_cmsDICT*) hDict;
+ cmsHANDLE hNew;
+- _cmsDICT* new_dict;
+ cmsDICTentry *entry;
+
+ _cmsAssert(old_dict != NULL);
+@@ -899,8 +925,6 @@
+ hNew = cmsDictAlloc(old_dict ->ContextID);
+ if (hNew == NULL) return NULL;
+
+- new_dict = (_cmsDICT*) hNew;
+-
+ // Walk the list freeing all nodes
+ entry = old_dict ->head;
+ while (entry != NULL) {
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2014-04-20 12:39:16.000000000 -0700
+@@ -27,6 +27,7 @@
+ // However, the following notice accompanied the original version of this
+ // file:
+ //
++
+ //---------------------------------------------------------------------------------
+ //
+ // Little Color Management System
+@@ -81,10 +82,6 @@
+ int nInputs;
+ int nOutputs;
+
+- // Since there is no limitation of the output number of channels, this buffer holding the connexion CLUT-shaper
+- // has to be dynamically allocated. This is not the case of first step shaper-CLUT, which is limited to max inputs
+- cmsUInt16Number* StageDEF;
+-
+ _cmsInterpFn16 EvalCurveIn16[MAX_INPUT_DIMENSIONS]; // The maximum number of input channels is known in advance
+ cmsInterpParams* ParamsCurveIn16[MAX_INPUT_DIMENSIONS];
+
+@@ -202,8 +199,6 @@
+ {
+ cmsBool AnyOpt = FALSE, Opt;
+
+- AnyOpt = FALSE;
+-
+ do {
+
+ Opt = FALSE;
+@@ -253,6 +248,7 @@
+ {
+ Prelin16Data* p16 = (Prelin16Data*) D;
+ cmsUInt16Number StageABC[MAX_INPUT_DIMENSIONS];
++ cmsUInt16Number StageDEF[cmsMAXCHANNELS];
+ int i;
+
+ for (i=0; i < p16 ->nInputs; i++) {
+@@ -260,11 +256,11 @@
+ p16 ->EvalCurveIn16[i](&Input[i], &StageABC[i], p16 ->ParamsCurveIn16[i]);
+ }
+
+- p16 ->EvalCLUT(StageABC, p16 ->StageDEF, p16 ->CLUTparams);
++ p16 ->EvalCLUT(StageABC, StageDEF, p16 ->CLUTparams);
+
+ for (i=0; i < p16 ->nOutputs; i++) {
+
+- p16 ->EvalCurveOut16[i](&p16->StageDEF[i], &Output[i], p16 ->ParamsCurveOut16[i]);
++ p16 ->EvalCurveOut16[i](&StageDEF[i], &Output[i], p16 ->ParamsCurveOut16[i]);
+ }
+ }
+
+@@ -274,7 +270,6 @@
+ {
+ Prelin16Data* p16 = (Prelin16Data*) ptr;
+
+- _cmsFree(ContextID, p16 ->StageDEF);
+ _cmsFree(ContextID, p16 ->EvalCurveOut16);
+ _cmsFree(ContextID, p16 ->ParamsCurveOut16);
+
+@@ -289,7 +284,6 @@
+
+ if (Duped == NULL) return NULL;
+
+- Duped ->StageDEF = _cmsCalloc(ContextID, p16 ->nOutputs, sizeof(cmsUInt16Number));
+ Duped ->EvalCurveOut16 = _cmsDupMem(ContextID, p16 ->EvalCurveOut16, p16 ->nOutputs * sizeof(_cmsInterpFn16));
+ Duped ->ParamsCurveOut16 = _cmsDupMem(ContextID, p16 ->ParamsCurveOut16, p16 ->nOutputs * sizeof(cmsInterpParams* ));
+
+@@ -328,7 +322,6 @@
+ p16 ->EvalCLUT = ColorMap ->Interpolation.Lerp16;
+
+
+- p16 -> StageDEF = _cmsCalloc(ContextID, p16 ->nOutputs, sizeof(cmsUInt16Number));
+ p16 -> EvalCurveOut16 = (_cmsInterpFn16*) _cmsCalloc(ContextID, nOutputs, sizeof(_cmsInterpFn16));
+ p16 -> ParamsCurveOut16 = (cmsInterpParams**) _cmsCalloc(ContextID, nOutputs, sizeof(cmsInterpParams* ));
+
+@@ -413,7 +406,7 @@
+ int i, index;
+
+ if (CLUT -> Type != cmsSigCLutElemType) {
+- cmsSignalError(CLUT->ContextID, cmsERROR_INTERNAL, "(internal) Attempt to PatchLUT on non-lut MPE");
++ cmsSignalError(CLUT->ContextID, cmsERROR_INTERNAL, "(internal) Attempt to PatchLUT on non-lut stage");
+ return FALSE;
+ }
+
+@@ -548,6 +541,10 @@
+ for (i=0; i < nOuts; i++) {
+
+ cmsToneCurve* InversePostLin = cmsReverseToneCurve(Curves[i]);
++ if (InversePostLin == NULL) {
++ WhiteOut[i] = 0;
++ continue;
++ }
+ WhiteOut[i] = cmsEvalToneCurve16(InversePostLin, WhitePointOut[i]);
+ cmsFreeToneCurve(InversePostLin);
+ }
+@@ -575,8 +572,8 @@
+ static
+ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt32Number* InputFormat, cmsUInt32Number* OutputFormat, cmsUInt32Number* dwFlags)
+ {
+- cmsPipeline* Src;
+- cmsPipeline* Dest;
++ cmsPipeline* Src = NULL;
++ cmsPipeline* Dest = NULL;
+ cmsStage* mpe;
+ cmsStage* CLUT;
+ cmsStage *KeepPreLin = NULL, *KeepPostLin = NULL;
+@@ -589,7 +586,6 @@
+ cmsToneCurve** DataSetOut;
+ Prelin16Data* p16;
+
+-
+ // This is a loosy optimization! does not apply in floating-point cases
+ if (_cmsFormatterIsFloat(*InputFormat) || _cmsFormatterIsFloat(*OutputFormat)) return FALSE;
+
+@@ -603,10 +599,10 @@
+
+ Src = *Lut;
+
+- // Named color pipelines cannot be optimized either
+- for (mpe = cmsPipelineGetPtrToFirstStage(Src);
+- mpe != NULL;
+- mpe = cmsStageNext(mpe)) {
++ // Named color pipelines cannot be optimized either
++ for (mpe = cmsPipelineGetPtrToFirstStage(Src);
++ mpe != NULL;
++ mpe = cmsStageNext(mpe)) {
+ if (cmsStageType(mpe) == cmsSigNamedColorElemType) return FALSE;
+ }
+
+@@ -628,7 +624,8 @@
+
+ // All seems ok, proceed.
+ NewPreLin = cmsStageDup(PreLin);
+- cmsPipelineInsertStage(Dest, cmsAT_BEGIN, NewPreLin);
++ if(!cmsPipelineInsertStage(Dest, cmsAT_BEGIN, NewPreLin))
++ goto Error;
+
+ // Remove prelinearization. Since we have duplicated the curve
+ // in destination LUT, the sampling shoud be applied after this stage.
+@@ -642,7 +639,9 @@
+ if (CLUT == NULL) return FALSE;
+
+ // Add the CLUT to the destination LUT
+- cmsPipelineInsertStage(Dest, cmsAT_END, CLUT);
++ if (!cmsPipelineInsertStage(Dest, cmsAT_END, CLUT)) {
++ goto Error;
++ }
+
+ // Postlinearization tables are kept unless indicated by flags
+ if (*dwFlags & cmsFLAGS_CLUT_POST_LINEARIZATION) {
+@@ -658,7 +657,8 @@
+
+ // All seems ok, proceed.
+ NewPostLin = cmsStageDup(PostLin);
+- cmsPipelineInsertStage(Dest, cmsAT_END, NewPostLin);
++ if (!cmsPipelineInsertStage(Dest, cmsAT_END, NewPostLin))
++ goto Error;
+
+ // In destination LUT, the sampling shoud be applied after this stage.
+ cmsPipelineUnlinkStage(Src, cmsAT_END, &KeepPostLin);
+@@ -669,10 +669,18 @@
+ // Now its time to do the sampling. We have to ignore pre/post linearization
+ // The source LUT whithout pre/post curves is passed as parameter.
+ if (!cmsStageSampleCLut16bit(CLUT, XFormSampler16, (void*) Src, 0)) {
+-
++Error:
+ // Ops, something went wrong, Restore stages
+- if (KeepPreLin != NULL) cmsPipelineInsertStage(Src, cmsAT_BEGIN, KeepPreLin);
+- if (KeepPostLin != NULL) cmsPipelineInsertStage(Src, cmsAT_END, KeepPostLin);
++ if (KeepPreLin != NULL) {
++ if (!cmsPipelineInsertStage(Src, cmsAT_BEGIN, KeepPreLin)) {
++ _cmsAssert(0); // This never happens
++ }
++ }
++ if (KeepPostLin != NULL) {
++ if (!cmsPipelineInsertStage(Src, cmsAT_END, KeepPostLin)) {
++ _cmsAssert(0); // This never happens
++ }
++ }
+ cmsPipelineFree(Dest);
+ return FALSE;
+ }
+@@ -699,12 +707,11 @@
+ else {
+
+ p16 = PrelinOpt16alloc(Dest ->ContextID,
+- DataCLUT ->Params,
+- Dest ->InputChannels,
+- DataSetIn,
+- Dest ->OutputChannels,
+- DataSetOut);
+-
++ DataCLUT ->Params,
++ Dest ->InputChannels,
++ DataSetIn,
++ Dest ->OutputChannels,
++ DataSetOut);
+
+ _cmsPipelineSetOptimizationParameters(Dest, PrelinEval16, (void*) p16, PrelinOpt16free, Prelin16dup);
+ }
+@@ -1058,7 +1065,8 @@
+ LutPlusCurves = cmsPipelineDup(OriginalLut);
+ if (LutPlusCurves == NULL) goto Error;
+
+- cmsPipelineInsertStage(LutPlusCurves, cmsAT_BEGIN, cmsStageAllocToneCurves(OriginalLut ->ContextID, OriginalLut ->InputChannels, TransReverse));
++ if (!cmsPipelineInsertStage(LutPlusCurves, cmsAT_BEGIN, cmsStageAllocToneCurves(OriginalLut ->ContextID, OriginalLut ->InputChannels, TransReverse)))
++ goto Error;
+
+ // Create the result LUT
+ OptimizedLUT = cmsPipelineAlloc(OriginalLut ->ContextID, OriginalLut ->InputChannels, OriginalLut ->OutputChannels);
+@@ -1067,13 +1075,15 @@
+ OptimizedPrelinMpe = cmsStageAllocToneCurves(OriginalLut ->ContextID, OriginalLut ->InputChannels, Trans);
+
+ // Create and insert the curves at the beginning
+- cmsPipelineInsertStage(OptimizedLUT, cmsAT_BEGIN, OptimizedPrelinMpe);
++ if (!cmsPipelineInsertStage(OptimizedLUT, cmsAT_BEGIN, OptimizedPrelinMpe))
++ goto Error;
+
+ // Allocate the CLUT for result
+ OptimizedCLUTmpe = cmsStageAllocCLut16bit(OriginalLut ->ContextID, nGridPoints, OriginalLut ->InputChannels, OriginalLut ->OutputChannels, NULL);
+
+ // Add the CLUT to the destination LUT
+- cmsPipelineInsertStage(OptimizedLUT, cmsAT_END, OptimizedCLUTmpe);
++ if (!cmsPipelineInsertStage(OptimizedLUT, cmsAT_END, OptimizedCLUTmpe))
++ goto Error;
+
+ // Resample the LUT
+ if (!cmsStageSampleCLut16bit(OptimizedCLUTmpe, XFormSampler16, (void*) LutPlusCurves, 0)) goto Error;
+@@ -1201,13 +1211,14 @@
+ for (i=0; i < nCurves; i++) {
+
+ c16->Curves[i] = _cmsCalloc(ContextID, nElements, sizeof(cmsUInt16Number));
++
+ if (c16->Curves[i] == NULL) {
++
+ for (j=0; j < i; j++) {
+ _cmsFree(ContextID, c16->Curves[j]);
+ }
+ _cmsFree(ContextID, c16->Curves);
+ _cmsFree(ContextID, c16);
+-
+ return NULL;
+ }
+
+@@ -1336,7 +1347,8 @@
+ // Maybe the curves are linear at the end
+ if (!AllCurvesAreLinear(ObtainedCurves)) {
+
+- cmsPipelineInsertStage(Dest, cmsAT_BEGIN, ObtainedCurves);
++ if (!cmsPipelineInsertStage(Dest, cmsAT_BEGIN, ObtainedCurves))
++ goto Error;
+
+ // If the curves are to be applied in 8 bits, we can save memory
+ if (_cmsFormatterIs8bit(*InputFormat)) {
+@@ -1344,6 +1356,7 @@
+ _cmsStageToneCurvesData* Data = (_cmsStageToneCurvesData*) ObtainedCurves ->Data;
+ Curves16Data* c16 = CurvesAlloc(Dest ->ContextID, Data ->nCurves, 256, Data ->TheCurves);
+
++ if (c16 == NULL) goto Error;
+ *dwFlags |= cmsFLAGS_NOCACHE;
+ _cmsPipelineSetOptimizationParameters(Dest, FastEvaluateCurves8, c16, CurvesFree, CurvesDup);
+
+@@ -1353,6 +1366,7 @@
+ _cmsStageToneCurvesData* Data = (_cmsStageToneCurvesData*) cmsStageData(ObtainedCurves);
+ Curves16Data* c16 = CurvesAlloc(Dest ->ContextID, Data ->nCurves, 65536, Data ->TheCurves);
+
++ if (c16 == NULL) goto Error;
+ *dwFlags |= cmsFLAGS_NOCACHE;
+ _cmsPipelineSetOptimizationParameters(Dest, FastEvaluateCurves16, c16, CurvesFree, CurvesDup);
+ }
+@@ -1362,7 +1376,8 @@
+ // LUT optimizes to nothing. Set the identity LUT
+ cmsStageFree(ObtainedCurves);
+
+- cmsPipelineInsertStage(Dest, cmsAT_BEGIN, cmsStageAllocIdentity(Dest ->ContextID, Src ->InputChannels));
++ if (!cmsPipelineInsertStage(Dest, cmsAT_BEGIN, cmsStageAllocIdentity(Dest ->ContextID, Src ->InputChannels)))
++ goto Error;
+
+ *dwFlags |= cmsFLAGS_NOCACHE;
+ _cmsPipelineSetOptimizationParameters(Dest, FastIdentity16, (void*) Dest, NULL, NULL);
+@@ -1592,10 +1607,14 @@
+ if (!Dest) return FALSE;
+
+ // Assamble the new LUT
+- cmsPipelineInsertStage(Dest, cmsAT_BEGIN, cmsStageDup(Curve1));
++ if (!cmsPipelineInsertStage(Dest, cmsAT_BEGIN, cmsStageDup(Curve1)))
++ goto Error;
++
+ if (!IdentityMat)
+- cmsPipelineInsertStage(Dest, cmsAT_END, cmsStageAllocMatrix(Dest ->ContextID, 3, 3, (const cmsFloat64Number*) &res, Data2 ->Offset));
+- cmsPipelineInsertStage(Dest, cmsAT_END, cmsStageDup(Curve2));
++ if (!cmsPipelineInsertStage(Dest, cmsAT_END, cmsStageAllocMatrix(Dest ->ContextID, 3, 3, (const cmsFloat64Number*) &res, Data2 ->Offset)))
++ goto Error;
++ if (!cmsPipelineInsertStage(Dest, cmsAT_END, cmsStageDup(Curve2)))
++ goto Error;
+
+ // If identity on matrix, we can further optimize the curves, so call the join curves routine
+ if (IdentityMat) {
+@@ -1617,6 +1636,10 @@
+ cmsPipelineFree(Src);
+ *Lut = Dest;
+ return TRUE;
++Error:
++ // Leave Src unchanged
++ cmsPipelineFree(Dest);
++ return FALSE;
+ }
+
+
+@@ -1646,7 +1669,7 @@
+ static _cmsOptimizationCollection* OptimizationCollection = DefaultOptimization;
+
+ // Register new ways to optimize
+-cmsBool _cmsRegisterOptimizationPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterOptimizationPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginOptimization* Plugin = (cmsPluginOptimization*) Data;
+ _cmsOptimizationCollection* fl;
+@@ -1660,7 +1683,7 @@
+ // Optimizer callback is required
+ if (Plugin ->OptimizePtr == NULL) return FALSE;
+
+- fl = (_cmsOptimizationCollection*) _cmsPluginMalloc(sizeof(_cmsOptimizationCollection));
++ fl = (_cmsOptimizationCollection*) _cmsPluginMalloc(id, sizeof(_cmsOptimizationCollection));
+ if (fl == NULL) return FALSE;
+
+ // Copy the parameters
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2014-04-20 12:39:16.000000000 -0700
+@@ -317,6 +317,23 @@
+ }
+
+ static
++cmsUInt8Number* Unroll3BytesSkip1SwapSwapFirst(register _cmsTRANSFORM* info,
++ register cmsUInt16Number wIn[],
++ register cmsUInt8Number* accum,
++ register cmsUInt32Number Stride)
++{
++ wIn[2] = FROM_8_TO_16(*accum); accum++; // B
++ wIn[1] = FROM_8_TO_16(*accum); accum++; // G
++ wIn[0] = FROM_8_TO_16(*accum); accum++; // R
++ accum++; // A
++
++ return accum;
++
++ cmsUNUSED_PARAMETER(info);
++ cmsUNUSED_PARAMETER(Stride);
++}
++
++static
+ cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info,
+ register cmsUInt16Number wIn[],
+ register cmsUInt8Number* accum,
+@@ -2901,6 +2918,9 @@
+ { CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Unroll3BytesSkip1Swap},
+ { CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll3BytesSkip1SwapFirst},
+
++ { CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1),
++ ANYSPACE, Unroll3BytesSkip1SwapSwapFirst},
++
+ { CHANNELS_SH(4)|BYTES_SH(1), ANYSPACE, Unroll4Bytes},
+ { CHANNELS_SH(4)|BYTES_SH(1)|FLAVOR_SH(1), ANYSPACE, Unroll4BytesReverse},
+ { CHANNELS_SH(4)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4BytesSwapFirst},
+@@ -3166,7 +3186,7 @@
+
+
+ // Formatters management
+-cmsBool _cmsRegisterFormattersPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterFormattersPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginFormatters* Plugin = (cmsPluginFormatters*) Data;
+ cmsFormattersFactoryList* fl ;
+@@ -3178,7 +3198,7 @@
+ return TRUE;
+ }
+
+- fl = (cmsFormattersFactoryList*) _cmsPluginMalloc(sizeof(cmsFormattersFactoryList));
++ fl = (cmsFormattersFactoryList*) _cmsPluginMalloc(id, sizeof(cmsFormattersFactoryList));
+ if (fl == NULL) return FALSE;
+
+ fl ->Factory = Plugin ->FormattersFactory;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2014-04-20 12:39:16.000000000 -0700
+@@ -898,9 +898,11 @@
+ {
+ switch (ColorSpace) {
+
++ case cmsSigMCH1Data:
+ case cmsSig1colorData:
+ case cmsSigGrayData: return 1;
+
++ case cmsSigMCH2Data:
+ case cmsSig2colorData: return 2;
+
+ case cmsSigXYZData:
+@@ -912,10 +914,12 @@
+ case cmsSigHsvData:
+ case cmsSigHlsData:
+ case cmsSigCmyData:
++ case cmsSigMCH3Data:
+ case cmsSig3colorData: return 3;
+
+ case cmsSigLuvKData:
+ case cmsSigCmykData:
++ case cmsSigMCH4Data:
+ case cmsSig4colorData: return 4;
+
+ case cmsSigMCH5Data:
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2014-04-20 12:39:16.000000000 -0700
+@@ -125,10 +125,14 @@
+ pOut[0] = pIn[7];
+
+ #else
+-
+ _cmsAssert(Result != NULL);
+
++# ifdef CMS_DONT_USE_INT64
++ (*Result)[0] = QWord[0];
++ (*Result)[1] = QWord[1];
++# else
+ *Result = *QWord;
++# endif
+ #endif
+ }
+
+@@ -543,10 +547,10 @@
+ static _cmsSubAllocator* PluginPool = NULL;
+
+ // Specialized malloc for plug-ins, that is freed upon exit.
+-void* _cmsPluginMalloc(cmsUInt32Number size)
++void* _cmsPluginMalloc(cmsContext id, cmsUInt32Number size)
+ {
+ if (PluginPool == NULL)
+- PluginPool = _cmsCreateSubAlloc(0, 4*1024);
++ PluginPool = _cmsCreateSubAlloc(id, 4*1024);
+
+ return _cmsSubAlloc(PluginPool, size);
+ }
+@@ -555,6 +559,11 @@
+ // Main plug-in dispatcher
+ cmsBool CMSEXPORT cmsPlugin(void* Plug_in)
+ {
++ return cmsPluginTHR(NULL, Plug_in);
++}
++
++cmsBool CMSEXPORT cmsPluginTHR(cmsContext id, void* Plug_in)
++{
+ cmsPluginBase* Plugin;
+
+ for (Plugin = (cmsPluginBase*) Plug_in;
+@@ -583,35 +592,35 @@
+ break;
+
+ case cmsPluginTagTypeSig:
+- if (!_cmsRegisterTagTypePlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterTagTypePlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginTagSig:
+- if (!_cmsRegisterTagPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterTagPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginFormattersSig:
+- if (!_cmsRegisterFormattersPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterFormattersPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginRenderingIntentSig:
+- if (!_cmsRegisterRenderingIntentPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterRenderingIntentPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginParametricCurveSig:
+- if (!_cmsRegisterParametricCurvesPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterParametricCurvesPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginMultiProcessElementSig:
+- if (!_cmsRegisterMultiProcessElementPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterMultiProcessElementPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginOptimizationSig:
+- if (!_cmsRegisterOptimizationPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterOptimizationPlugin(id, Plugin)) return FALSE;
+ break;
+
+ case cmsPluginTransformSig:
+- if (!_cmsRegisterTransformPlugin(Plugin)) return FALSE;
++ if (!_cmsRegisterTransformPlugin(id, Plugin)) return FALSE;
+ break;
+
+ default:
+@@ -630,14 +639,14 @@
+ {
+ _cmsRegisterMemHandlerPlugin(NULL);
+ _cmsRegisterInterpPlugin(NULL);
+- _cmsRegisterTagTypePlugin(NULL);
+- _cmsRegisterTagPlugin(NULL);
+- _cmsRegisterFormattersPlugin(NULL);
+- _cmsRegisterRenderingIntentPlugin(NULL);
+- _cmsRegisterParametricCurvesPlugin(NULL);
+- _cmsRegisterMultiProcessElementPlugin(NULL);
+- _cmsRegisterOptimizationPlugin(NULL);
+- _cmsRegisterTransformPlugin(NULL);
++ _cmsRegisterTagTypePlugin(NULL, NULL);
++ _cmsRegisterTagPlugin(NULL, NULL);
++ _cmsRegisterFormattersPlugin(NULL, NULL);
++ _cmsRegisterRenderingIntentPlugin(NULL, NULL);
++ _cmsRegisterParametricCurvesPlugin(NULL, NULL);
++ _cmsRegisterMultiProcessElementPlugin(NULL, NULL);
++ _cmsRegisterOptimizationPlugin(NULL, NULL);
++ _cmsRegisterTransformPlugin(NULL, NULL);
+
+ if (PluginPool != NULL)
+ _cmsSubAllocDestroy(PluginPool);
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2014-04-20 12:39:16.000000000 -0700
+@@ -806,7 +806,6 @@
+
+ mpe = Pipeline ->Elements;
+
+-
+ switch (cmsStageInputChannels(mpe)) {
+ case 3:
+
+@@ -838,8 +837,6 @@
+ mpe = mpe ->Next;
+ }
+
+-
+-
+ if (cmsStageType(mpe) == cmsSigCLutElemType) {
+
+ _cmsIOPrintf(m, "/Table ");
+@@ -854,7 +851,6 @@
+ _cmsIOPrintf(m, " >>\n");
+ _cmsIOPrintf(m, "]\n");
+
+-
+ return 1;
+ }
+
+@@ -950,6 +946,7 @@
+
+ rc = EmitCIEBasedDEF(m, DeviceLink, Intent, &BlackPointAdaptedToD50);
+ cmsPipelineFree(DeviceLink);
++ if (rc == 0) return 0;
+ }
+ break;
+
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2014-04-20 12:39:16.000000000 -0700
+@@ -56,6 +56,8 @@
+ #include "lcms2_internal.h"
+
+
++#define cmsmin(a, b) (((a) < (b)) ? (a) : (b))
++#define cmsmax(a, b) (((a) > (b)) ? (a) : (b))
+
+ // This file contains routines for resampling and LUT optimization, black point detection
+ // and black preservation.
+@@ -67,13 +69,13 @@
+ static
+ cmsHTRANSFORM CreateRoundtripXForm(cmsHPROFILE hProfile, cmsUInt32Number nIntent)
+ {
+- cmsHPROFILE hLab = cmsCreateLab4Profile(NULL);
++ cmsContext ContextID = cmsGetProfileContextID(hProfile);
++ cmsHPROFILE hLab = cmsCreateLab4ProfileTHR(ContextID, NULL);
+ cmsHTRANSFORM xform;
+ cmsBool BPC[4] = { FALSE, FALSE, FALSE, FALSE };
+ cmsFloat64Number States[4] = { 1.0, 1.0, 1.0, 1.0 };
+ cmsHPROFILE hProfiles[4];
+ cmsUInt32Number Intents[4];
+- cmsContext ContextID = cmsGetProfileContextID(hProfile);
+
+ hProfiles[0] = hLab; hProfiles[1] = hProfile; hProfiles[2] = hProfile; hProfiles[3] = hLab;
+ Intents[0] = INTENT_RELATIVE_COLORIMETRIC; Intents[1] = nIntent; Intents[2] = INTENT_RELATIVE_COLORIMETRIC; Intents[3] = INTENT_RELATIVE_COLORIMETRIC;
+@@ -141,8 +143,8 @@
+ cmsCloseProfile(hLab);
+
+ if (xform == NULL) {
+- // Something went wrong. Get rid of open resources and return zero as black
+
++ // Something went wrong. Get rid of open resources and return zero as black
+ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
+ return FALSE;
+ }
+@@ -173,7 +175,6 @@
+ // Lab (0, 0, 0) -> [Perceptual] Profile -> CMYK -> [Rel. colorimetric] Profile -> Lab
+ static
+ cmsBool BlackPointUsingPerceptualBlack(cmsCIEXYZ* BlackPoint, cmsHPROFILE hProfile)
+-
+ {
+ cmsHTRANSFORM hRoundTrip;
+ cmsCIELab LabIn, LabOut;
+@@ -218,17 +219,27 @@
+ // involves to turn BP to neutral and to use only L component.
+ cmsBool CMSEXPORT cmsDetectBlackPoint(cmsCIEXYZ* BlackPoint, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
+ {
++ cmsProfileClassSignature devClass;
+
+- // Zero for black point
+- if (cmsGetDeviceClass(hProfile) == cmsSigLinkClass) {
++ // Make sure the device class is adequate
++ devClass = cmsGetDeviceClass(hProfile);
++ if (devClass == cmsSigLinkClass ||
++ devClass == cmsSigAbstractClass ||
++ devClass == cmsSigNamedColorClass) {
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
++ }
+
+- BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
+- return FALSE;
++ // Make sure intent is adequate
++ if (Intent != INTENT_PERCEPTUAL &&
++ Intent != INTENT_RELATIVE_COLORIMETRIC &&
++ Intent != INTENT_SATURATION) {
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
+ }
+
+ // v4 + perceptual & saturation intents does have its own black point, and it is
+ // well specified enough to use it. Black point tag is deprecated in V4.
+-
+ if ((cmsGetEncodedICCversion(hProfile) >= 0x4000000) &&
+ (Intent == INTENT_PERCEPTUAL || Intent == INTENT_SATURATION)) {
+
+@@ -303,7 +314,7 @@
+ {
+ double sum_x = 0, sum_x2 = 0, sum_x3 = 0, sum_x4 = 0;
+ double sum_y = 0, sum_yx = 0, sum_yx2 = 0;
+- double disc;
++ double d, a, b, c;
+ int i;
+ cmsMAT3 m;
+ cmsVEC3 v, res;
+@@ -333,14 +344,32 @@
+
+ if (!_cmsMAT3solve(&res, &m, &v)) return 0;
+
+- // y = t x2 + u x + c
+- // x = ( - u + Sqrt( u^2 - 4 t c ) ) / ( 2 t )
+- disc = res.n[1]*res.n[1] - 4.0 * res.n[0] * res.n[2];
+- if (disc < 0) return -1;
+
+- return ( -1.0 * res.n[1] + sqrt( disc )) / (2.0 * res.n[0]);
++ a = res.n[2];
++ b = res.n[1];
++ c = res.n[0];
++
++ if (fabs(a) < 1.0E-10) {
++
++ return cmsmin(0, cmsmax(50, -c/b ));
++ }
++ else {
++
++ d = b*b - 4.0 * a * c;
++ if (d <= 0) {
++ return 0;
++ }
++ else {
++
++ double rt = (-b + sqrt(d)) / (2.0 * a);
++
++ return cmsmax(0, cmsmin(50, rt));
++ }
++ }
++
+ }
+
++/*
+ static
+ cmsBool IsMonotonic(int n, const cmsFloat64Number Table[])
+ {
+@@ -361,6 +390,7 @@
+
+ return TRUE;
+ }
++*/
+
+ // Calculates the black point of a destination profile.
+ // This algorithm comes from the Adobe paper disclosing its black point compensation method.
+@@ -369,21 +399,30 @@
+ cmsColorSpaceSignature ColorSpace;
+ cmsHTRANSFORM hRoundTrip = NULL;
+ cmsCIELab InitialLab, destLab, Lab;
+-
++ cmsFloat64Number inRamp[256], outRamp[256];
+ cmsFloat64Number MinL, MaxL;
+- cmsBool NearlyStraightMidRange = FALSE;
+- cmsFloat64Number L;
+- cmsFloat64Number x[101], y[101];
+- cmsFloat64Number lo, hi, NonMonoMin;
+- int n, l, i, NonMonoIndx;
+-
++ cmsBool NearlyStraightMidrange = TRUE;
++ cmsFloat64Number yRamp[256];
++ cmsFloat64Number x[256], y[256];
++ cmsFloat64Number lo, hi;
++ int n, l;
++ cmsProfileClassSignature devClass;
++
++ // Make sure the device class is adequate
++ devClass = cmsGetDeviceClass(hProfile);
++ if (devClass == cmsSigLinkClass ||
++ devClass == cmsSigAbstractClass ||
++ devClass == cmsSigNamedColorClass) {
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
++ }
+
+ // Make sure intent is adequate
+ if (Intent != INTENT_PERCEPTUAL &&
+ Intent != INTENT_RELATIVE_COLORIMETRIC &&
+ Intent != INTENT_SATURATION) {
+- BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
+- return FALSE;
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
+ }
+
+
+@@ -415,10 +454,8 @@
+ return cmsDetectBlackPoint(BlackPoint, hProfile, Intent, dwFlags);
+ }
+
+- // It is one of the valid cases!, presto chargo hocus pocus, go for the Adobe magic
++ // It is one of the valid cases!, use Adobe algorithm
+
+- // Step 1
+- // ======
+
+ // Set a first guess, that should work on good profiles.
+ if (Intent == INTENT_RELATIVE_COLORIMETRIC) {
+@@ -449,71 +486,68 @@
+ hRoundTrip = CreateRoundtripXForm(hProfile, Intent);
+ if (hRoundTrip == NULL) return FALSE;
+
+- // Calculate Min L*
+- Lab = InitialLab;
+- Lab.L = 0;
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
+- MinL = destLab.L;
+-
+- // Calculate Max L*
+- Lab = InitialLab;
+- Lab.L = 100;
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
+- MaxL = destLab.L;
++ // Compute ramps
+
+- // Step 3
+- // ======
++ for (l=0; l < 256; l++) {
+
+- // check if quadratic estimation needs to be done.
+- if (Intent == INTENT_RELATIVE_COLORIMETRIC) {
++ Lab.L = (cmsFloat64Number) (l * 100.0) / 255.0;
++ Lab.a = cmsmin(50, cmsmax(-50, InitialLab.a));
++ Lab.b = cmsmin(50, cmsmax(-50, InitialLab.b));
+
+- // Conceptually, this code tests how close the source l and converted L are to one another in the mid-range
+- // of the values. If the converted ramp of L values is close enough to a straight line y=x, then InitialLab
+- // is good enough to be the DestinationBlackPoint,
+- NearlyStraightMidRange = TRUE;
++ cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
++
++ inRamp[l] = Lab.L;
++ outRamp[l] = destLab.L;
++ }
++
++ // Make monotonic
++ for (l = 254; l > 0; --l) {
++ outRamp[l] = cmsmin(outRamp[l], outRamp[l+1]);
++ }
+
+- for (l=0; l <= 100; l++) {
++ // Check
++ if (! (outRamp[0] < outRamp[255])) {
+
+- Lab.L = l;
+- Lab.a = InitialLab.a;
+- Lab.b = InitialLab.b;
++ cmsDeleteTransform(hRoundTrip);
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
++ }
+
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
+
+- L = destLab.L;
++ // Test for mid range straight (only on relative colorimetric)
+
+- // Check the mid range in 20% after MinL
+- if (L > (MinL + 0.2 * (MaxL - MinL))) {
++ NearlyStraightMidrange = TRUE;
++ MinL = outRamp[0]; MaxL = outRamp[255];
++ if (Intent == INTENT_RELATIVE_COLORIMETRIC) {
+
+- // Is close enough?
+- if (fabs(L - l) > 4.0) {
++ for (l=0; l < 256; l++) {
+
+- // Too far away, profile is buggy!
+- NearlyStraightMidRange = FALSE;
+- break;
+- }
+- }
++ if (! ((inRamp[l] <= MinL + 0.2 * (MaxL - MinL) ) ||
++ (fabs(inRamp[l] - outRamp[l]) < 4.0 )))
++ NearlyStraightMidrange = FALSE;
+ }
+- }
+- else {
+- // Check is always performed for perceptual and saturation intents
+- NearlyStraightMidRange = FALSE;
+- }
+
++ // If the mid range is straight (as determined above) then the
++ // DestinationBlackPoint shall be the same as initialLab.
++ // Otherwise, the DestinationBlackPoint shall be determined
++ // using curve fitting.
+
+- // If no furter checking is needed, we are done
+- if (NearlyStraightMidRange) {
++ if (NearlyStraightMidrange) {
+
+- cmsLab2XYZ(NULL, BlackPoint, &InitialLab);
+- cmsDeleteTransform(hRoundTrip);
+- return TRUE;
++ cmsLab2XYZ(NULL, BlackPoint, &InitialLab);
++ cmsDeleteTransform(hRoundTrip);
++ return TRUE;
++ }
+ }
+
+- // The round-trip curve normally looks like a nearly constant section at the black point,
++
++ // curve fitting: The round-trip curve normally looks like a nearly constant section at the black point,
+ // with a corner and a nearly straight line to the white point.
+
+- // STEP 4
+- // =======
++ for (l=0; l < 256; l++) {
++
++ yRamp[l] = (outRamp[l] - MinL) / (MaxL - MinL);
++ }
+
+ // find the black point using the least squares error quadratic curve fitting
+
+@@ -528,62 +562,32 @@
+ hi = 0.25;
+ }
+
+- // Capture points for the fitting.
++ // Capture shadow points for the fitting.
+ n = 0;
+- for (l=0; l <= 100; l++) {
+-
+- cmsFloat64Number ff;
+-
+- Lab.L = (cmsFloat64Number) l;
+- Lab.a = InitialLab.a;
+- Lab.b = InitialLab.b;
++ for (l=0; l < 256; l++) {
+
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
+-
+- ff = (destLab.L - MinL)/(MaxL - MinL);
++ cmsFloat64Number ff = yRamp[l];
+
+ if (ff >= lo && ff < hi) {
+-
+- x[n] = Lab.L;
+- y[n] = ff;
++ x[n] = inRamp[l];
++ y[n] = yRamp[l];
+ n++;
+ }
+-
+ }
+
+- // This part is not on the Adobe paper, but I found is necessary for getting any result.
+-
+- if (IsMonotonic(n, y)) {
+-
+- // Monotonic means lower point is stil valid
+- cmsLab2XYZ(NULL, BlackPoint, &InitialLab);
+- cmsDeleteTransform(hRoundTrip);
+- return TRUE;
+- }
+
+- // No suitable points, regret and use safer algorithm
+- if (n == 0) {
++ // No suitable points
++ if (n < 3 ) {
+ cmsDeleteTransform(hRoundTrip);
+- return cmsDetectBlackPoint(BlackPoint, hProfile, Intent, dwFlags);
+- }
+-
+-
+- NonMonoMin = 100;
+- NonMonoIndx = 0;
+- for (i=0; i < n; i++) {
+-
+- if (y[i] < NonMonoMin) {
+- NonMonoIndx = i;
+- NonMonoMin = y[i];
+- }
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
+ }
+
+- Lab.L = x[NonMonoIndx];
+
+ // fit and get the vertex of quadratic curve
+ Lab.L = RootOfLeastSquaresFitQuadraticCurve(n, x, y);
+
+- if (Lab.L < 0.0 || Lab.L > 50.0) { // clip to zero L* if the vertex is negative
++ if (Lab.L < 0.0) { // clip to zero L* if the vertex is negative
+ Lab.L = 0;
+ }
+
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2014-04-20 12:39:16.000000000 -0700
+@@ -91,7 +91,7 @@
+
+ // Register a new type handler. This routine is shared between normal types and MPE
+ static
+-cmsBool RegisterTypesPlugin(cmsPluginBase* Data, _cmsTagTypeLinkedList* LinkedList, cmsUInt32Number DefaultListCount)
++cmsBool RegisterTypesPlugin(cmsContext id, cmsPluginBase* Data, _cmsTagTypeLinkedList* LinkedList, cmsUInt32Number DefaultListCount)
+ {
+ cmsPluginTagType* Plugin = (cmsPluginTagType*) Data;
+ _cmsTagTypeLinkedList *pt, *Anterior = NULL;
+@@ -118,7 +118,7 @@
+ }
+
+ // Registering happens in plug-in memory pool
+- pt = (_cmsTagTypeLinkedList*) _cmsPluginMalloc(sizeof(_cmsTagTypeLinkedList));
++ pt = (_cmsTagTypeLinkedList*) _cmsPluginMalloc(id, sizeof(_cmsTagTypeLinkedList));
+ if (pt == NULL) return FALSE;
+
+ pt ->Handler = Plugin ->Handler;
+@@ -208,10 +208,10 @@
+ cmsUInt32Number *ElementOffsets = NULL, *ElementSizes = NULL;
+
+ // Let's take the offsets to each element
+- ElementOffsets = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number *));
++ ElementOffsets = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number));
+ if (ElementOffsets == NULL) goto Error;
+
+- ElementSizes = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number *));
++ ElementSizes = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number));
+ if (ElementSizes == NULL) goto Error;
+
+ for (i=0; i < Count; i++) {
+@@ -257,10 +257,10 @@
+ cmsUInt32Number *ElementOffsets = NULL, *ElementSizes = NULL;
+
+ // Create table
+- ElementOffsets = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number *));
++ ElementOffsets = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number));
+ if (ElementOffsets == NULL) goto Error;
+
+- ElementSizes = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number *));
++ ElementSizes = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number));
+ if (ElementSizes == NULL) goto Error;
+
+ // Keep starting position of curve offsets
+@@ -456,6 +456,7 @@
+ void* Type_Chromaticity_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
+ {
+ return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsCIExyYTRIPLE));
++
+ cmsUNUSED_PARAMETER(n);
+ }
+
+@@ -1106,8 +1107,6 @@
+ {
+ cmsUInt32Number Count;
+ cmsToneCurve* NewGamma;
+- cmsUInt16Number Linear[2] = { 0, 0xffff };
+-
+
+ *nItems = 0;
+ if (!_cmsReadUInt32Number(io, &Count)) return NULL;
+@@ -1115,11 +1114,14 @@
+ switch (Count) {
+
+ case 0: // Linear.
++ {
++ cmsFloat64Number SingleGamma = 1.0;
+
+- NewGamma = cmsBuildTabulatedToneCurve16(self ->ContextID, 2, Linear);
+- if (!NewGamma) return NULL;
+- *nItems = 1;
+- return NewGamma;
++ NewGamma = cmsBuildParametricToneCurve(self ->ContextID, 1, &SingleGamma);
++ if (!NewGamma) return NULL;
++ *nItems = 1;
++ return NewGamma;
++ }
+
+ case 1: // Specified as the exponent of gamma function
+ {
+@@ -1210,6 +1212,7 @@
+ if (ICCVersion < 4.0) return cmsSigCurveType;
+ if (Curve ->nSegments != 1) return cmsSigCurveType; // Only 1-segment curves can be saved as parametric
+ if (Curve ->Segments[0].Type < 0) return cmsSigCurveType; // Only non-inverted curves
++ if (Curve ->Segments[0].Type > 5) return cmsSigCurveType; // Only ICC parametric curves
+
+ return cmsSigParametricCurveType;
+ }
+@@ -1386,6 +1389,9 @@
+ {
+ cmsICCMeasurementConditions mc;
+
++
++ memset(&mc, 0, sizeof(mc));
++
+ if (!_cmsReadUInt32Number(io, &mc.Observer)) return NULL;
+ if (!_cmsReadXYZNumber(io, &mc.Backing)) return NULL;
+ if (!_cmsReadUInt32Number(io, &mc.Geometry)) return NULL;
+@@ -1640,7 +1646,6 @@
+ static
+ cmsBool Read8bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut, int nChannels)
+ {
+- cmsStage* mpe;
+ cmsUInt8Number* Temp = NULL;
+ int i, j;
+ cmsToneCurve* Tables[cmsMAXCHANNELS];
+@@ -1669,11 +1674,8 @@
+ _cmsFree(ContextID, Temp);
+ Temp = NULL;
+
+-
+- mpe = cmsStageAllocToneCurves(ContextID, nChannels, Tables);
+- if (mpe == NULL) goto Error;
+-
+- cmsPipelineInsertStage(lut, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, nChannels, Tables)))
++ goto Error;
+
+ for (i=0; i < nChannels; i++)
+ cmsFreeToneCurve(Tables[i]);
+@@ -1701,21 +1703,30 @@
+
+ if (Tables) {
+
+- if (Tables ->TheCurves[i]->nEntries != 256) {
+- cmsSignalError(ContextID, cmsERROR_RANGE, "LUT8 needs 256 entries on prelinearization");
+- return FALSE;
+- }
+-
+- }
+-
+- for (j=0; j < 256; j++) {
++ // Usual case of identity curves
++ if ((Tables ->TheCurves[i]->nEntries == 2) &&
++ (Tables->TheCurves[i]->Table16[0] == 0) &&
++ (Tables->TheCurves[i]->Table16[1] == 65535)) {
+
+- if (Tables != NULL)
+- val = (cmsUInt8Number) FROM_16_TO_8(Tables->TheCurves[i]->Table16[j]);
++ for (j=0; j < 256; j++) {
++ if (!_cmsWriteUInt8Number(io, (cmsUInt8Number) j)) return FALSE;
++ }
++ }
+ else
+- val = (cmsUInt8Number) j;
++ if (Tables ->TheCurves[i]->nEntries != 256) {
++ cmsSignalError(ContextID, cmsERROR_RANGE, "LUT8 needs 256 entries on prelinearization");
++ return FALSE;
++ }
++ else
++ for (j=0; j < 256; j++) {
++
++ if (Tables != NULL)
++ val = (cmsUInt8Number) FROM_16_TO_8(Tables->TheCurves[i]->Table16[j]);
++ else
++ val = (cmsUInt8Number) j;
+
+- if (!_cmsWriteUInt8Number(io, val)) return FALSE;
++ if (!_cmsWriteUInt8Number(io, val)) return FALSE;
++ }
+ }
+ }
+ return TRUE;
+@@ -1724,7 +1735,7 @@
+
+ // Check overflow
+ static
+-size_t uipow(cmsUInt32Number n, cmsUInt32Number a, cmsUInt32Number b)
++cmsUInt32Number uipow(cmsUInt32Number n, cmsUInt32Number a, cmsUInt32Number b)
+ {
+ cmsUInt32Number rv = 1, rc;
+
+@@ -1736,13 +1747,13 @@
+ rv *= a;
+
+ // Check for overflow
+- if (rv > UINT_MAX / a) return (size_t) -1;
++ if (rv > UINT_MAX / a) return (cmsUInt32Number) -1;
+
+ }
+
+ rc = rv * n;
+
+- if (rv != rc / n) return (size_t) -1;
++ if (rv != rc / n) return (cmsUInt32Number) -1;
+ return rc;
+ }
+
+@@ -1757,7 +1768,6 @@
+ cmsUInt8Number InputChannels, OutputChannels, CLUTpoints;
+ cmsUInt8Number* Temp = NULL;
+ cmsPipeline* NewLUT = NULL;
+- cmsStage *mpemat, *mpeclut;
+ cmsUInt32Number nTabSize, i;
+ cmsFloat64Number Matrix[3*3];
+
+@@ -1796,9 +1806,8 @@
+ // Only operates if not identity...
+ if ((InputChannels == 3) && !_cmsMAT3isIdentity((cmsMAT3*) Matrix)) {
+
+- mpemat = cmsStageAllocMatrix(self ->ContextID, 3, 3, Matrix, NULL);
+- if (mpemat == NULL) goto Error;
+- cmsPipelineInsertStage(NewLUT, cmsAT_BEGIN, mpemat);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_BEGIN, cmsStageAllocMatrix(self ->ContextID, 3, 3, Matrix, NULL)))
++ goto Error;
+ }
+
+ // Get input tables
+@@ -1806,13 +1815,10 @@
+
+ // Get 3D CLUT. Check the overflow....
+ nTabSize = uipow(OutputChannels, CLUTpoints, InputChannels);
+- if (nTabSize == (size_t) -1) goto Error;
++ if (nTabSize == (cmsUInt32Number) -1) goto Error;
+ if (nTabSize > 0) {
+
+ cmsUInt16Number *PtrW, *T;
+- cmsUInt32Number Tsize;
+-
+- Tsize = (cmsUInt32Number) nTabSize * sizeof(cmsUInt16Number);
+
+ PtrW = T = (cmsUInt16Number*) _cmsCalloc(self ->ContextID, nTabSize, sizeof(cmsUInt16Number));
+ if (T == NULL) goto Error;
+@@ -1829,10 +1835,8 @@
+ _cmsFree(self ->ContextID, Temp);
+ Temp = NULL;
+
+-
+- mpeclut = cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T);
+- if (mpeclut == NULL) goto Error;
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpeclut);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T)))
++ goto Error;
+ _cmsFree(self ->ContextID, T);
+ }
+
+@@ -1934,7 +1938,7 @@
+ if (!Write8bitTables(self ->ContextID, io, NewLUT ->InputChannels, PreMPE)) return FALSE;
+
+ nTabSize = uipow(NewLUT->OutputChannels, clutPoints, NewLUT ->InputChannels);
+- if (nTabSize == (size_t) -1) return FALSE;
++ if (nTabSize == (cmsUInt32Number) -1) return FALSE;
+ if (nTabSize > 0) {
+
+ // The 3D CLUT.
+@@ -1983,7 +1987,6 @@
+ static
+ cmsBool Read16bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut, int nChannels, int nEntries)
+ {
+- cmsStage* mpe;
+ int i;
+ cmsToneCurve* Tables[cmsMAXCHANNELS];
+
+@@ -2007,10 +2010,8 @@
+
+
+ // Add the table (which may certainly be an identity, but this is up to the optimizer, not the reading code)
+- mpe = cmsStageAllocToneCurves(ContextID, nChannels, Tables);
+- if (mpe == NULL) goto Error;
+-
+- cmsPipelineInsertStage(lut, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, nChannels, Tables)))
++ goto Error;
+
+ for (i=0; i < nChannels; i++)
+ cmsFreeToneCurve(Tables[i]);
+@@ -2031,7 +2032,9 @@
+ int j;
+ cmsUInt32Number i;
+ cmsUInt16Number val;
+- int nEntries = 256;
++ int nEntries;
++
++ _cmsAssert(Tables != NULL);
+
+ nEntries = Tables->TheCurves[0]->nEntries;
+
+@@ -2039,11 +2042,7 @@
+
+ for (j=0; j < nEntries; j++) {
+
+- if (Tables != NULL)
+- val = Tables->TheCurves[i]->Table16[j];
+- else
+- val = _cmsQuantizeVal(j, nEntries);
+-
++ val = Tables->TheCurves[i]->Table16[j];
+ if (!_cmsWriteUInt16Number(io, val)) return FALSE;
+ }
+ }
+@@ -2057,7 +2056,6 @@
+ {
+ cmsUInt8Number InputChannels, OutputChannels, CLUTpoints;
+ cmsPipeline* NewLUT = NULL;
+- cmsStage *mpemat, *mpeclut;
+ cmsUInt32Number nTabSize;
+ cmsFloat64Number Matrix[3*3];
+ cmsUInt16Number InputEntries, OutputEntries;
+@@ -2094,9 +2092,8 @@
+ // Only operates on 3 channels
+ if ((InputChannels == 3) && !_cmsMAT3isIdentity((cmsMAT3*) Matrix)) {
+
+- mpemat = cmsStageAllocMatrix(self ->ContextID, 3, 3, Matrix, NULL);
+- if (mpemat == NULL) goto Error;
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpemat);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, cmsStageAllocMatrix(self ->ContextID, 3, 3, Matrix, NULL)))
++ goto Error;
+ }
+
+ if (!_cmsReadUInt16Number(io, &InputEntries)) goto Error;
+@@ -2110,7 +2107,7 @@
+
+ // Get 3D CLUT
+ nTabSize = uipow(OutputChannels, CLUTpoints, InputChannels);
+- if (nTabSize == (size_t) -1) goto Error;
++ if (nTabSize == (cmsUInt32Number) -1) goto Error;
+ if (nTabSize > 0) {
+
+ cmsUInt16Number *T;
+@@ -2123,13 +2120,10 @@
+ goto Error;
+ }
+
+- mpeclut = cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T);
+- if (mpeclut == NULL) {
+- _cmsFree(self ->ContextID, T);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T))) {
++ _cmsFree(self ->ContextID, T);
+ goto Error;
+ }
+-
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpeclut);
+ _cmsFree(self ->ContextID, T);
+ }
+
+@@ -2159,7 +2153,7 @@
+ _cmsStageToneCurvesData* PreMPE = NULL, *PostMPE = NULL;
+ _cmsStageMatrixData* MatMPE = NULL;
+ _cmsStageCLutData* clut = NULL;
+- int InputChannels, OutputChannels, clutPoints;
++ int i, InputChannels, OutputChannels, clutPoints;
+
+ // Disassemble the LUT into components.
+ mpe = NewLUT -> Elements;
+@@ -2234,13 +2228,13 @@
+ if (PreMPE != NULL) {
+ if (!_cmsWriteUInt16Number(io, (cmsUInt16Number) PreMPE ->TheCurves[0]->nEntries)) return FALSE;
+ } else {
+- if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
++ if (!_cmsWriteUInt16Number(io, 2)) return FALSE;
+ }
+
+ if (PostMPE != NULL) {
+ if (!_cmsWriteUInt16Number(io, (cmsUInt16Number) PostMPE ->TheCurves[0]->nEntries)) return FALSE;
+ } else {
+- if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
++ if (!_cmsWriteUInt16Number(io, 2)) return FALSE;
+
+ }
+
+@@ -2249,9 +2243,16 @@
+ if (PreMPE != NULL) {
+ if (!Write16bitTables(self ->ContextID, io, PreMPE)) return FALSE;
+ }
++ else {
++ for (i=0; i < InputChannels; i++) {
++
++ if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
++ if (!_cmsWriteUInt16Number(io, 0xffff)) return FALSE;
++ }
++ }
+
+ nTabSize = uipow(OutputChannels, clutPoints, InputChannels);
+- if (nTabSize == (size_t) -1) return FALSE;
++ if (nTabSize == (cmsUInt32Number) -1) return FALSE;
+ if (nTabSize > 0) {
+ // The 3D CLUT.
+ if (clut != NULL) {
+@@ -2263,7 +2264,13 @@
+ if (PostMPE != NULL) {
+ if (!Write16bitTables(self ->ContextID, io, PostMPE)) return FALSE;
+ }
++ else {
++ for (i=0; i < OutputChannels; i++) {
+
++ if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
++ if (!_cmsWriteUInt16Number(io, 0xffff)) return FALSE;
++ }
++ }
+
+ return TRUE;
+
+@@ -2479,7 +2486,6 @@
+ cmsUInt32Number offsetM; // Offset to first "M" curve
+ cmsUInt32Number offsetC; // Offset to CLUT
+ cmsUInt32Number offsetA; // Offset to first "A" curve
+- cmsStage* mpe;
+ cmsPipeline* NewLUT = NULL;
+
+
+@@ -2501,37 +2507,35 @@
+ if (NewLUT == NULL) return NULL;
+
+ if (offsetA!= 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetA, inputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetA, inputChan)))
++ goto Error;
+ }
+
+ if (offsetC != 0) {
+- mpe = ReadCLUT(self, io, BaseOffset + offsetC, inputChan, outputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadCLUT(self, io, BaseOffset + offsetC, inputChan, outputChan)))
++ goto Error;
+ }
+
+ if (offsetM != 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetM, outputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetM, outputChan)))
++ goto Error;
+ }
+
+ if (offsetMat != 0) {
+- mpe = ReadMatrix(self, io, BaseOffset + offsetMat);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadMatrix(self, io, BaseOffset + offsetMat)))
++ goto Error;
+ }
+
+ if (offsetB != 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetB, outputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetB, outputChan)))
++ goto Error;
+ }
+
+ *nItems = 1;
+ return NewLUT;
++Error:
++ cmsPipelineFree(NewLUT);
++ return NULL;
+
+ cmsUNUSED_PARAMETER(SizeOfTag);
+ }
+@@ -2798,7 +2802,6 @@
+ cmsUInt32Number offsetM; // Offset to first "M" curve
+ cmsUInt32Number offsetC; // Offset to CLUT
+ cmsUInt32Number offsetA; // Offset to first "A" curve
+- cmsStage* mpe;
+ cmsPipeline* NewLUT = NULL;
+
+
+@@ -2821,37 +2824,35 @@
+ if (NewLUT == NULL) return NULL;
+
+ if (offsetB != 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetB, inputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetB, inputChan)))
++ goto Error;
+ }
+
+ if (offsetMat != 0) {
+- mpe = ReadMatrix(self, io, BaseOffset + offsetMat);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadMatrix(self, io, BaseOffset + offsetMat)))
++ goto Error;
+ }
+
+ if (offsetM != 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetM, inputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetM, inputChan)))
++ goto Error;
+ }
+
+ if (offsetC != 0) {
+- mpe = ReadCLUT(self, io, BaseOffset + offsetC, inputChan, outputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadCLUT(self, io, BaseOffset + offsetC, inputChan, outputChan)))
++ goto Error;
+ }
+
+ if (offsetA!= 0) {
+- mpe = ReadSetOfCurves(self, io, BaseOffset + offsetA, outputChan);
+- if (mpe == NULL) { cmsPipelineFree(NewLUT); return NULL; }
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, ReadSetOfCurves(self, io, BaseOffset + offsetA, outputChan)))
++ goto Error;
+ }
+
+ *nItems = 1;
+ return NewLUT;
++Error:
++ cmsPipelineFree(NewLUT);
++ return NULL;
+
+ cmsUNUSED_PARAMETER(SizeOfTag);
+ }
+@@ -3287,7 +3288,7 @@
+ SizeOfTag -= sizeof(cmsUInt32Number);
+
+ if (!_cmsReadUInt64Number(io, &sec ->attributes)) goto Error;
+- if (SizeOfTag < sizeof(cmsUInt32Number)) goto Error;
++ if (SizeOfTag < sizeof(cmsUInt64Number)) goto Error;
+ SizeOfTag -= sizeof(cmsUInt64Number);
+
+ if (!_cmsReadUInt32Number(io, (cmsUInt32Number *)&sec ->technology)) goto Error;
+@@ -4292,6 +4293,9 @@
+ if (!_cmsReadUInt16Number(io, &InputChans)) return NULL;
+ if (!_cmsReadUInt16Number(io, &OutputChans)) return NULL;
+
++ if (InputChans == 0) goto Error;
++ if (OutputChans == 0) goto Error;
++
+ if (io ->Read(io, Dimensions8, sizeof(cmsUInt8Number), 16) != 16)
+ goto Error;
+
+@@ -4381,7 +4385,6 @@
+ {
+ cmsStageSignature ElementSig;
+ cmsTagTypeHandler* TypeHandler;
+- cmsStage *mpe = NULL;
+ cmsUInt32Number nItems;
+ cmsPipeline *NewLUT = (cmsPipeline *) Cargo;
+
+@@ -4409,11 +4412,8 @@
+ if (TypeHandler ->ReadPtr != NULL) {
+
+ // This is a real element which should be read and processed
+- mpe = (cmsStage*) TypeHandler ->ReadPtr(self, io, &nItems, SizeOfTag);
+- if (mpe == NULL) return FALSE;
+-
+- // All seems ok, insert element
+- cmsPipelineInsertStage(NewLUT, cmsAT_END, mpe);
++ if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, (cmsStage*) TypeHandler ->ReadPtr(self, io, &nItems, SizeOfTag)))
++ return FALSE;
+ }
+
+ return TRUE;
+@@ -4479,10 +4479,10 @@
+ outputChan = cmsPipelineOutputChannels(Lut);
+ ElemCount = cmsPipelineStageCount(Lut);
+
+- ElementOffsets = (cmsUInt32Number *) _cmsCalloc(self ->ContextID, ElemCount, sizeof(cmsUInt32Number *));
++ ElementOffsets = (cmsUInt32Number *) _cmsCalloc(self ->ContextID, ElemCount, sizeof(cmsUInt32Number));
+ if (ElementOffsets == NULL) goto Error;
+
+- ElementSizes = (cmsUInt32Number *) _cmsCalloc(self ->ContextID, ElemCount, sizeof(cmsUInt32Number *));
++ ElementSizes = (cmsUInt32Number *) _cmsCalloc(self ->ContextID, ElemCount, sizeof(cmsUInt32Number));
+ if (ElementSizes == NULL) goto Error;
+
+ // Write the head
+@@ -4825,10 +4825,10 @@
+ static
+ cmsBool AllocElem(cmsContext ContextID, _cmsDICelem* e, cmsUInt32Number Count)
+ {
+- e->Offsets = (cmsUInt32Number *) _cmsCalloc(ContextID, Count, sizeof(cmsUInt32Number *));
++ e->Offsets = (cmsUInt32Number *) _cmsCalloc(ContextID, Count, sizeof(cmsUInt32Number));
+ if (e->Offsets == NULL) return FALSE;
+
+- e->Sizes = (cmsUInt32Number *) _cmsCalloc(ContextID, Count, sizeof(cmsUInt32Number *));
++ e->Sizes = (cmsUInt32Number *) _cmsCalloc(ContextID, Count, sizeof(cmsUInt32Number));
+ if (e->Sizes == NULL) {
+
+ _cmsFree(ContextID, e -> Offsets);
+@@ -4844,7 +4844,7 @@
+ void FreeElem(_cmsDICelem* e)
+ {
+ if (e ->Offsets != NULL) _cmsFree(e -> ContextID, e -> Offsets);
+- if (e ->Sizes != NULL) _cmsFree(e -> ContextID, e ->Sizes);
++ if (e ->Sizes != NULL) _cmsFree(e -> ContextID, e -> Sizes);
+ e->Offsets = e ->Sizes = NULL;
+ }
+
+@@ -5084,7 +5084,7 @@
+ if (!_cmsReadUInt32Number(io, &Count)) return NULL;
+ SizeOfTag -= sizeof(cmsUInt32Number);
+
+- // Get rec lenghth
++ // Get rec length
+ if (!_cmsReadUInt32Number(io, &Length)) return NULL;
+ SizeOfTag -= sizeof(cmsUInt32Number);
+
+@@ -5118,14 +5118,22 @@
+ if (!ReadOneMLUC(self, io, &a.DisplayValue, i, &DisplayValueMLU)) goto Error;
+ }
+
++ if (NameWCS == NULL || ValueWCS == NULL) {
++
++ cmsSignalError(self->ContextID, cmsERROR_CORRUPTION_DETECTED, "Bad dictionary Name/Value");
++ rc = FALSE;
++ }
++ else {
++
+ rc = cmsDictAddEntry(hDict, NameWCS, ValueWCS, DisplayNameMLU, DisplayValueMLU);
++ }
+
+ if (NameWCS != NULL) _cmsFree(self ->ContextID, NameWCS);
+ if (ValueWCS != NULL) _cmsFree(self ->ContextID, ValueWCS);
+ if (DisplayNameMLU != NULL) cmsMLUfree(DisplayNameMLU);
+ if (DisplayValueMLU != NULL) cmsMLUfree(DisplayValueMLU);
+
+- if (!rc) return FALSE;
++ if (!rc) goto Error;
+ }
+
+ FreeArray(&a);
+@@ -5277,14 +5285,14 @@
+ #define DEFAULT_TAG_TYPE_COUNT (sizeof(SupportedTagTypes) / sizeof(_cmsTagTypeLinkedList))
+
+ // Both kind of plug-ins share same structure
+-cmsBool _cmsRegisterTagTypePlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterTagTypePlugin(cmsContext id, cmsPluginBase* Data)
+ {
+- return RegisterTypesPlugin(Data, SupportedTagTypes, DEFAULT_TAG_TYPE_COUNT);
++ return RegisterTypesPlugin(id, Data, SupportedTagTypes, DEFAULT_TAG_TYPE_COUNT);
+ }
+
+-cmsBool _cmsRegisterMultiProcessElementPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterMultiProcessElementPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+- return RegisterTypesPlugin(Data, SupportedMPEtypes, DEFAULT_MPE_TYPE_COUNT);
++ return RegisterTypesPlugin(id, Data, SupportedMPEtypes, DEFAULT_MPE_TYPE_COUNT);
+ }
+
+
+@@ -5391,7 +5399,9 @@
+ { cmsSigScreeningTag, { 1, 1, { cmsSigScreeningType}, NULL }, &SupportedTags[59]},
+ { cmsSigVcgtTag, { 1, 1, { cmsSigVcgtType}, NULL }, &SupportedTags[60]},
+ { cmsSigMetaTag, { 1, 1, { cmsSigDictType}, NULL }, &SupportedTags[61]},
+- { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL}, NULL}
++ { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL }, &SupportedTags[62]},
++ { cmsSigProfileDescriptionMLTag,{ 1, 1, { cmsSigMultiLocalizedUnicodeType}, NULL}, NULL}
++
+
+ };
+
+@@ -5406,7 +5416,7 @@
+
+ #define DEFAULT_TAG_COUNT (sizeof(SupportedTags) / sizeof(_cmsTagLinkedList))
+
+-cmsBool _cmsRegisterTagPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterTagPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginTag* Plugin = (cmsPluginTag*) Data;
+ _cmsTagLinkedList *pt, *Anterior;
+@@ -5430,7 +5440,7 @@
+ pt = pt ->Next;
+ }
+
+- pt = (_cmsTagLinkedList*) _cmsPluginMalloc(sizeof(_cmsTagLinkedList));
++ pt = (_cmsTagLinkedList*) _cmsPluginMalloc(id, sizeof(_cmsTagLinkedList));
+ if (pt == NULL) return FALSE;
+
+ pt ->Signature = Plugin ->Signature;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2014-04-20 12:39:16.000000000 -0700
+@@ -208,9 +208,26 @@
+
+ if (TransferFunction) {
+
++ // Tries to minimize space. Thanks to Richard Hughes for this nice idea
+ if (!cmsWriteTag(hICC, cmsSigRedTRCTag, (void*) TransferFunction[0])) goto Error;
+- if (!cmsWriteTag(hICC, cmsSigGreenTRCTag, (void*) TransferFunction[1])) goto Error;
+- if (!cmsWriteTag(hICC, cmsSigBlueTRCTag, (void*) TransferFunction[2])) goto Error;
++
++ if (TransferFunction[1] == TransferFunction[0]) {
++
++ if (!cmsLinkTag (hICC, cmsSigGreenTRCTag, cmsSigRedTRCTag)) goto Error;
++
++ } else {
++
++ if (!cmsWriteTag(hICC, cmsSigGreenTRCTag, (void*) TransferFunction[1])) goto Error;
++ }
++
++ if (TransferFunction[2] == TransferFunction[0]) {
++
++ if (!cmsLinkTag (hICC, cmsSigBlueTRCTag, cmsSigRedTRCTag)) goto Error;
++
++ } else {
++
++ if (!cmsWriteTag(hICC, cmsSigBlueTRCTag, (void*) TransferFunction[2])) goto Error;
++ }
+ }
+
+ if (Primaries) {
+@@ -303,7 +320,6 @@
+ {
+ cmsHPROFILE hICC;
+ cmsPipeline* Pipeline;
+- cmsStage* Lin;
+ int nChannels;
+
+ hICC = cmsCreateProfilePlaceholder(ContextID);
+@@ -327,10 +343,8 @@
+
+
+ // Copy tables to Pipeline
+- Lin = cmsStageAllocToneCurves(ContextID, nChannels, TransferFunctions);
+- if (Lin == NULL) goto Error;
+-
+- cmsPipelineInsertStage(Pipeline, cmsAT_BEGIN, Lin);
++ if (!cmsPipelineInsertStage(Pipeline, cmsAT_BEGIN, cmsStageAllocToneCurves(ContextID, nChannels, TransferFunctions)))
++ goto Error;
+
+ // Create tags
+ if (!SetTextTags(hICC, L"Linearization built-in")) goto Error;
+@@ -344,6 +358,7 @@
+ return hICC;
+
+ Error:
++ cmsPipelineFree(Pipeline);
+ if (hICC)
+ cmsCloseProfile(hICC);
+
+@@ -451,9 +466,10 @@
+
+ if (!cmsStageSampleCLut16bit(CLUT, InkLimitingSampler, (void*) &Limit, 0)) goto Error;
+
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, nChannels));
+- cmsPipelineInsertStage(LUT, cmsAT_END, CLUT);
+- cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocIdentityCurves(ContextID, nChannels));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, nChannels)) ||
++ !cmsPipelineInsertStage(LUT, cmsAT_END, CLUT) ||
++ !cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocIdentityCurves(ContextID, nChannels)))
++ goto Error;
+
+ // Create tags
+ if (!SetTextTags(hICC, L"ink-limiting built-in")) goto Error;
+@@ -504,7 +520,8 @@
+ LUT = cmsPipelineAlloc(ContextID, 3, 3);
+ if (LUT == NULL) goto Error;
+
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCLut(ContextID, 3));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCLut(ContextID, 3)))
++ goto Error;
+
+ if (!cmsWriteTag(hProfile, cmsSigAToB0Tag, LUT)) goto Error;
+ cmsPipelineFree(LUT);
+@@ -550,7 +567,8 @@
+ LUT = cmsPipelineAlloc(ContextID, 3, 3);
+ if (LUT == NULL) goto Error;
+
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, 3));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, 3)))
++ goto Error;
+
+ if (!cmsWriteTag(hProfile, cmsSigAToB0Tag, LUT)) goto Error;
+ cmsPipelineFree(LUT);
+@@ -595,7 +613,8 @@
+ LUT = cmsPipelineAlloc(ContextID, 3, 3);
+ if (LUT == NULL) goto Error;
+
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, 3));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, 3)))
++ goto Error;
+
+ if (!cmsWriteTag(hProfile, cmsSigAToB0Tag, LUT)) goto Error;
+ cmsPipelineFree(LUT);
+@@ -734,81 +753,83 @@
+ // contrast, Saturation and white point displacement
+
+ cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
+- int nLUTPoints,
+- cmsFloat64Number Bright,
+- cmsFloat64Number Contrast,
+- cmsFloat64Number Hue,
+- cmsFloat64Number Saturation,
+- int TempSrc,
+- int TempDest)
+-{
+- cmsHPROFILE hICC;
+- cmsPipeline* Pipeline;
+- BCHSWADJUSTS bchsw;
+- cmsCIExyY WhitePnt;
+- cmsStage* CLUT;
+- cmsUInt32Number Dimensions[MAX_INPUT_DIMENSIONS];
+- int i;
+-
+-
+- bchsw.Brightness = Bright;
+- bchsw.Contrast = Contrast;
+- bchsw.Hue = Hue;
+- bchsw.Saturation = Saturation;
+-
+- cmsWhitePointFromTemp(&WhitePnt, TempSrc );
+- cmsxyY2XYZ(&bchsw.WPsrc, &WhitePnt);
+-
+- cmsWhitePointFromTemp(&WhitePnt, TempDest);
+- cmsxyY2XYZ(&bchsw.WPdest, &WhitePnt);
+-
+- hICC = cmsCreateProfilePlaceholder(ContextID);
+- if (!hICC) // can't allocate
+- return NULL;
+-
+-
+- cmsSetDeviceClass(hICC, cmsSigAbstractClass);
+- cmsSetColorSpace(hICC, cmsSigLabData);
+- cmsSetPCS(hICC, cmsSigLabData);
+-
+- cmsSetHeaderRenderingIntent(hICC, INTENT_PERCEPTUAL);
+-
+-
+- // Creates a Pipeline with 3D grid only
+- Pipeline = cmsPipelineAlloc(ContextID, 3, 3);
+- if (Pipeline == NULL) {
+- cmsCloseProfile(hICC);
+- return NULL;
+- }
++ int nLUTPoints,
++ cmsFloat64Number Bright,
++ cmsFloat64Number Contrast,
++ cmsFloat64Number Hue,
++ cmsFloat64Number Saturation,
++ int TempSrc,
++ int TempDest)
++{
++ cmsHPROFILE hICC;
++ cmsPipeline* Pipeline;
++ BCHSWADJUSTS bchsw;
++ cmsCIExyY WhitePnt;
++ cmsStage* CLUT;
++ cmsUInt32Number Dimensions[MAX_INPUT_DIMENSIONS];
++ int i;
+
+- for (i=0; i < MAX_INPUT_DIMENSIONS; i++) Dimensions[i] = nLUTPoints;
+- CLUT = cmsStageAllocCLut16bitGranular(ContextID, Dimensions, 3, 3, NULL);
+- if (CLUT == NULL) return NULL;
++ bchsw.Brightness = Bright;
++ bchsw.Contrast = Contrast;
++ bchsw.Hue = Hue;
++ bchsw.Saturation = Saturation;
+
++ cmsWhitePointFromTemp(&WhitePnt, TempSrc );
++ cmsxyY2XYZ(&bchsw.WPsrc, &WhitePnt);
+
+- if (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0)) {
++ cmsWhitePointFromTemp(&WhitePnt, TempDest);
++ cmsxyY2XYZ(&bchsw.WPdest, &WhitePnt);
+
+- // Shouldn't reach here
+- cmsPipelineFree(Pipeline);
+- cmsCloseProfile(hICC);
+- return NULL;
+- }
++ hICC = cmsCreateProfilePlaceholder(ContextID);
++ if (!hICC) // can't allocate
++ return NULL;
+
+- cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT);
+
+- // Create tags
++ cmsSetDeviceClass(hICC, cmsSigAbstractClass);
++ cmsSetColorSpace(hICC, cmsSigLabData);
++ cmsSetPCS(hICC, cmsSigLabData);
+
+- if (!SetTextTags(hICC, L"BCHS built-in")) return NULL;
++ cmsSetHeaderRenderingIntent(hICC, INTENT_PERCEPTUAL);
+
+- cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*) cmsD50_XYZ());
++ // Creates a Pipeline with 3D grid only
++ Pipeline = cmsPipelineAlloc(ContextID, 3, 3);
++ if (Pipeline == NULL) {
++ cmsCloseProfile(hICC);
++ return NULL;
++ }
++
++ for (i=0; i < MAX_INPUT_DIMENSIONS; i++) Dimensions[i] = nLUTPoints;
++ CLUT = cmsStageAllocCLut16bitGranular(ContextID, Dimensions, 3, 3, NULL);
++ if (CLUT == NULL) return NULL;
++
++
++ if (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0)) {
++
++ // Shouldn't reach here
++ goto Error;
++ }
++
++ if (!cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT)) {
++ goto Error;
++ }
++
++ // Create tags
++ if (!SetTextTags(hICC, L"BCHS built-in")) return NULL;
++
++ cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*) cmsD50_XYZ());
+
+- cmsWriteTag(hICC, cmsSigAToB0Tag, (void*) Pipeline);
++ cmsWriteTag(hICC, cmsSigAToB0Tag, (void*) Pipeline);
+
+- // Pipeline is already on virtual profile
+- cmsPipelineFree(Pipeline);
++ // Pipeline is already on virtual profile
++ cmsPipelineFree(Pipeline);
+
+- // Ok, done
+- return hICC;
++ // Ok, done
++ return hICC;
++
++Error:
++ cmsPipelineFree(Pipeline);
++ cmsCloseProfile(hICC);
++ return NULL;
+ }
+
+
+@@ -856,7 +877,8 @@
+ PostLin = cmsStageAllocToneCurves(ContextID, 1, &EmptyTab);
+ cmsFreeToneCurve(EmptyTab);
+
+- cmsPipelineInsertStage(LUT, cmsAT_END, PostLin);
++ if (!cmsPipelineInsertStage(LUT, cmsAT_END, PostLin))
++ goto Error;
+
+ if (!cmsWriteTag(hProfile, cmsSigBToA0Tag, (void*) LUT)) goto Error;
+ if (!cmsWriteTag(hProfile, cmsSigMediaWhitePointTag, cmsD50_XYZ())) goto Error;
+@@ -999,6 +1021,7 @@
+
+ { FALSE, 0, cmsSigLut16Type, 4, { cmsSigMatrixElemType, cmsSigCurveSetElemType, cmsSigCLutElemType, cmsSigCurveSetElemType}},
+ { FALSE, 0, cmsSigLut16Type, 3, { cmsSigCurveSetElemType, cmsSigCLutElemType, cmsSigCurveSetElemType}},
++ { FALSE, 0, cmsSigLut16Type, 2, { cmsSigCurveSetElemType, cmsSigCLutElemType}},
+ { TRUE , 0, cmsSigLutAtoBType, 1, { cmsSigCurveSetElemType }},
+ { TRUE , cmsSigAToB0Tag, cmsSigLutAtoBType, 3, { cmsSigCurveSetElemType, cmsSigMatrixElemType, cmsSigCurveSetElemType } },
+ { TRUE , cmsSigAToB0Tag, cmsSigLutAtoBType, 3, { cmsSigCurveSetElemType, cmsSigCLutElemType, cmsSigCurveSetElemType } },
+@@ -1059,6 +1082,7 @@
+ cmsContext ContextID = cmsGetTransformContextID(hTransform);
+ const cmsAllowedLUT* AllowedLUT;
+ cmsTagSignature DestinationTag;
++ cmsProfileClassSignature deviceClass;
+
+ _cmsAssert(hTransform != NULL);
+
+@@ -1080,13 +1104,15 @@
+ // Time to fix the Lab2/Lab4 issue.
+ if ((xform ->EntryColorSpace == cmsSigLabData) && (Version < 4.0)) {
+
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocLabV2ToV4curves(ContextID));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocLabV2ToV4curves(ContextID)))
++ goto Error;
+ }
+
+ // On the output side too
+ if ((xform ->ExitColorSpace) == cmsSigLabData && (Version < 4.0)) {
+
+- cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocLabV4ToV2(ContextID));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocLabV4ToV2(ContextID)))
++ goto Error;
+ }
+
+
+@@ -1108,8 +1134,9 @@
+ FrmIn = COLORSPACE_SH(ColorSpaceBitsIn) | CHANNELS_SH(ChansIn)|BYTES_SH(2);
+ FrmOut = COLORSPACE_SH(ColorSpaceBitsOut) | CHANNELS_SH(ChansOut)|BYTES_SH(2);
+
++ deviceClass = cmsGetDeviceClass(hProfile);
+
+- if (cmsGetDeviceClass(hProfile) == cmsSigOutputClass)
++ if (deviceClass == cmsSigOutputClass)
+ DestinationTag = cmsSigBToA0Tag;
+ else
+ DestinationTag = cmsSigAToB0Tag;
+@@ -1136,10 +1163,12 @@
+
+ // Put identity curves if needed
+ if (cmsPipelineGetPtrToFirstStage(LUT) ->Type != cmsSigCurveSetElemType)
+- cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, ChansIn));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, ChansIn)))
++ goto Error;
+
+ if (cmsPipelineGetPtrToLastStage(LUT) ->Type != cmsSigCurveSetElemType)
+- cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocIdentityCurves(ContextID, ChansOut));
++ if (!cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocIdentityCurves(ContextID, ChansOut)))
++ goto Error;
+
+ AllowedLUT = FindCombination(LUT, Version >= 4.0, DestinationTag);
+ }
+@@ -1168,10 +1197,22 @@
+ if (!cmsWriteTag(hProfile, cmsSigColorantTableOutTag, xform->OutputColorant)) goto Error;
+ }
+
+- if (xform ->Sequence != NULL) {
++ if ((deviceClass == cmsSigLinkClass) && (xform ->Sequence != NULL)) {
+ if (!_cmsWriteProfileSequence(hProfile, xform ->Sequence)) goto Error;
+ }
+
++ // Set the white point
++ if (deviceClass == cmsSigInputClass) {
++ if (!cmsWriteTag(hProfile, cmsSigMediaWhitePointTag, &xform ->EntryWhitePoint)) goto Error;
++ }
++ else {
++ if (!cmsWriteTag(hProfile, cmsSigMediaWhitePointTag, &xform ->ExitWhitePoint)) goto Error;
++ }
++
++
++ // Per 7.2.15 in spec 4.3
++ cmsSetHeaderRenderingIntent(hProfile, xform ->RenderingIntent);
++
+ cmsPipelineFree(LUT);
+ return hProfile;
+
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2014-04-20 12:39:16.000000000 -0700
+@@ -30,7 +30,7 @@
+ //---------------------------------------------------------------------------------
+ //
+ // Little Color Management System
+-// Copyright (c) 1998-2010 Marti Maria Saguer
++// Copyright (c) 1998-2012 Marti Maria Saguer
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -76,48 +76,48 @@
+ // Obtains WhitePoint from Temperature
+ cmsBool CMSEXPORT cmsWhitePointFromTemp(cmsCIExyY* WhitePoint, cmsFloat64Number TempK)
+ {
+- cmsFloat64Number x, y;
+- cmsFloat64Number T, T2, T3;
+- // cmsFloat64Number M1, M2;
++ cmsFloat64Number x, y;
++ cmsFloat64Number T, T2, T3;
++ // cmsFloat64Number M1, M2;
+
+- _cmsAssert(WhitePoint != NULL);
+-
+- T = TempK;
+- T2 = T*T; // Square
+- T3 = T2*T; // Cube
+-
+- // For correlated color temperature (T) between 4000K and 7000K:
++ _cmsAssert(WhitePoint != NULL);
+
+- if (T >= 4000. && T <= 7000.)
+- {
+- x = -4.6070*(1E9/T3) + 2.9678*(1E6/T2) + 0.09911*(1E3/T) + 0.244063;
+- }
+- else
+- // or for correlated color temperature (T) between 7000K and 25000K:
++ T = TempK;
++ T2 = T*T; // Square
++ T3 = T2*T; // Cube
++
++ // For correlated color temperature (T) between 4000K and 7000K:
++
++ if (T >= 4000. && T <= 7000.)
++ {
++ x = -4.6070*(1E9/T3) + 2.9678*(1E6/T2) + 0.09911*(1E3/T) + 0.244063;
++ }
++ else
++ // or for correlated color temperature (T) between 7000K and 25000K:
+
+- if (T > 7000.0 && T <= 25000.0)
+- {
+- x = -2.0064*(1E9/T3) + 1.9018*(1E6/T2) + 0.24748*(1E3/T) + 0.237040;
+- }
+- else {
+- cmsSignalError(0, cmsERROR_RANGE, "cmsWhitePointFromTemp: invalid temp");
+- return FALSE;
+- }
++ if (T > 7000.0 && T <= 25000.0)
++ {
++ x = -2.0064*(1E9/T3) + 1.9018*(1E6/T2) + 0.24748*(1E3/T) + 0.237040;
++ }
++ else {
++ cmsSignalError(0, cmsERROR_RANGE, "cmsWhitePointFromTemp: invalid temp");
++ return FALSE;
++ }
+
+- // Obtain y(x)
++ // Obtain y(x)
+
+- y = -3.000*(x*x) + 2.870*x - 0.275;
++ y = -3.000*(x*x) + 2.870*x - 0.275;
+
+- // wave factors (not used, but here for futures extensions)
++ // wave factors (not used, but here for futures extensions)
+
+- // M1 = (-1.3515 - 1.7703*x + 5.9114 *y)/(0.0241 + 0.2562*x - 0.7341*y);
+- // M2 = (0.0300 - 31.4424*x + 30.0717*y)/(0.0241 + 0.2562*x - 0.7341*y);
++ // M1 = (-1.3515 - 1.7703*x + 5.9114 *y)/(0.0241 + 0.2562*x - 0.7341*y);
++ // M2 = (0.0300 - 31.4424*x + 30.0717*y)/(0.0241 + 0.2562*x - 0.7341*y);
+
+- WhitePoint -> x = x;
+- WhitePoint -> y = y;
+- WhitePoint -> Y = 1.0;
++ WhitePoint -> x = x;
++ WhitePoint -> y = y;
++ WhitePoint -> Y = 1.0;
+
+- return TRUE;
++ return TRUE;
+ }
+
+
+@@ -266,7 +266,7 @@
+ {{ 0.8951, 0.2664, -0.1614 }},
+ {{ -0.7502, 1.7135, 0.0367 }},
+ {{ 0.0389, -0.0685, 1.0296 }}
+- }};
++ }};
+
+ if (ConeMatrix == NULL)
+ ConeMatrix = &LamRigg;
+--- jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2014-04-20 12:39:16.000000000 -0700
+@@ -396,7 +396,7 @@
+ static _cmsTransformCollection* TransformCollection = NULL;
+
+ // Register new ways to transform
+-cmsBool _cmsRegisterTransformPlugin(cmsPluginBase* Data)
++cmsBool _cmsRegisterTransformPlugin(cmsContext id, cmsPluginBase* Data)
+ {
+ cmsPluginTransform* Plugin = (cmsPluginTransform*) Data;
+ _cmsTransformCollection* fl;
+@@ -412,7 +412,7 @@
+ if (Plugin ->Factory == NULL) return FALSE;
+
+
+- fl = (_cmsTransformCollection*) _cmsPluginMalloc(sizeof(_cmsTransformCollection));
++ fl = (_cmsTransformCollection*) _cmsPluginMalloc(id, sizeof(_cmsTransformCollection));
+ if (fl == NULL) return FALSE;
+
+ // Copy the parameters
+@@ -651,6 +651,22 @@
+
+ // ----------------------------------------------------------------------------------------------------------------
+
++static
++void SetWhitePoint(cmsCIEXYZ* wtPt, const cmsCIEXYZ* src)
++{
++ if (src == NULL) {
++ wtPt ->X = cmsD50X;
++ wtPt ->Y = cmsD50Y;
++ wtPt ->Z = cmsD50Z;
++ }
++ else {
++ wtPt ->X = src->X;
++ wtPt ->Y = src->Y;
++ wtPt ->Z = src->Z;
++ }
++
++}
++
+ // New to lcms 2.0 -- have all parameters available.
+ cmsHTRANSFORM CMSEXPORT cmsCreateExtendedTransform(cmsContext ContextID,
+ cmsUInt32Number nProfiles, cmsHPROFILE hProfiles[],
+@@ -664,7 +680,6 @@
+ cmsUInt32Number dwFlags)
+ {
+ _cmsTRANSFORM* xform;
+- cmsBool FloatTransform;
+ cmsColorSpaceSignature EntryColorSpace;
+ cmsColorSpaceSignature ExitColorSpace;
+ cmsPipeline* Lut;
+@@ -681,9 +696,7 @@
+ if (hGamutProfile == NULL) dwFlags &= ~cmsFLAGS_GAMUTCHECK;
+ }
+
+- // On floating point transforms, inhibit optimizations
+- FloatTransform = (_cmsFormatterIsFloat(InputFormat) && _cmsFormatterIsFloat(OutputFormat));
+-
++ // On floating point transforms, inhibit cache
+ if (_cmsFormatterIsFloat(InputFormat) || _cmsFormatterIsFloat(OutputFormat))
+ dwFlags |= cmsFLAGS_NOCACHE;
+
+@@ -730,6 +743,10 @@
+ xform ->ExitColorSpace = ExitColorSpace;
+ xform ->RenderingIntent = Intents[nProfiles-1];
+
++ // Take white points
++ SetWhitePoint(&xform->EntryWhitePoint, (cmsCIEXYZ*) cmsReadTag(hProfiles[0], cmsSigMediaWhitePointTag));
++ SetWhitePoint(&xform->ExitWhitePoint, (cmsCIEXYZ*) cmsReadTag(hProfiles[nProfiles-1], cmsSigMediaWhitePointTag));
++
+
+ // Create a gamut check LUT if requested
+ if (hGamutProfile != NULL && (dwFlags & cmsFLAGS_GAMUTCHECK))
+--- jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2014-04-20 12:39:16.000000000 -0700
+@@ -30,7 +30,7 @@
+ //---------------------------------------------------------------------------------
+ //
+ // Little Color Management System
+-// Copyright (c) 1998-2011 Marti Maria Saguer
++// Copyright (c) 1998-2013 Marti Maria Saguer
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -52,7 +52,7 @@
+ //
+ //---------------------------------------------------------------------------------
+ //
+-// Version 2.4
++// Version 2.5
+ //
+
+ #ifndef _lcms2_H
+@@ -101,7 +101,7 @@
+ #endif
+
+ // Version/release
+-#define LCMS_VERSION 2040
++#define LCMS_VERSION 2050
+
+ // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
+ #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
+@@ -367,6 +367,7 @@
+ cmsSigPreview1Tag = 0x70726531, // 'pre1'
+ cmsSigPreview2Tag = 0x70726532, // 'pre2'
+ cmsSigProfileDescriptionTag = 0x64657363, // 'desc'
++ cmsSigProfileDescriptionMLTag = 0x6473636d, // 'dscm'
+ cmsSigProfileSequenceDescTag = 0x70736571, // 'pseq'
+ cmsSigProfileSequenceIdTag = 0x70736964, // 'psid'
+ cmsSigPs2CRD0Tag = 0x70736430, // 'psd0'
+@@ -1014,6 +1015,7 @@
+ // Plug-In registering ---------------------------------------------------------------------------------------------------
+
+ CMSAPI cmsBool CMSEXPORT cmsPlugin(void* Plugin);
++CMSAPI cmsBool CMSEXPORT cmsPluginTHR(cmsContext ContextID, void* Plugin);
+ CMSAPI void CMSEXPORT cmsUnregisterPlugins(void);
+
+ // Error logging ----------------------------------------------------------------------------------------------------------
+@@ -1190,7 +1192,7 @@
+ // Where to place/locate the stages in the pipeline chain
+ typedef enum { cmsAT_BEGIN, cmsAT_END } cmsStageLoc;
+
+-CMSAPI void CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe);
++CMSAPI int CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe);
+ CMSAPI void CMSEXPORT cmsPipelineUnlinkStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage** mpe);
+
+ // This function is quite useful to analyze the structure of a Pipeline and retrieve the Stage elements
+@@ -1274,6 +1276,13 @@
+ const char LanguageCode[3], const char CountryCode[3],
+ char ObtainedLanguage[3], char ObtainedCountry[3]);
+
++CMSAPI cmsUInt32Number CMSEXPORT cmsMLUtranslationsCount(const cmsMLU* mlu);
++
++CMSAPI cmsBool CMSEXPORT cmsMLUtranslationsCodes(const cmsMLU* mlu,
++ cmsUInt32Number idx,
++ char LanguageCode[3],
++ char CountryCode[3]);
++
+ // Undercolorremoval & black generation -------------------------------------------------------------------------------------
+
+ typedef struct {
+@@ -1424,6 +1433,7 @@
+ CMSAPI void CMSEXPORT cmsSetHeaderFlags(cmsHPROFILE hProfile, cmsUInt32Number Flags);
+ CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderManufacturer(cmsHPROFILE hProfile);
+ CMSAPI void CMSEXPORT cmsSetHeaderManufacturer(cmsHPROFILE hProfile, cmsUInt32Number manufacturer);
++CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderCreator(cmsHPROFILE hProfile);
+ CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderModel(cmsHPROFILE hProfile);
+ CMSAPI void CMSEXPORT cmsSetHeaderModel(cmsHPROFILE hProfile, cmsUInt32Number model);
+ CMSAPI void CMSEXPORT cmsSetHeaderAttributes(cmsHPROFILE hProfile, cmsUInt64Number Flags);
+--- jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2013-09-06 11:29:02.000000000 -0700
++++ jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2014-04-20 12:39:16.000000000 -0700
+@@ -27,7 +27,7 @@
+ // However, the following notice accompanied the original version of this
+ // file:
+ //
+-//---------------------------------------------------------------------------------
++
+ //
+ // Little Color Management System
+ // Copyright (c) 1998-2011 Marti Maria Saguer
+@@ -196,7 +196,7 @@
+ // Plug-In registering ---------------------------------------------------------------
+
+ // Specialized function for plug-in memory management. No pairing free() since whole pool is freed at once.
+-void* _cmsPluginMalloc(cmsUInt32Number size);
++void* _cmsPluginMalloc(cmsContext ContextID, cmsUInt32Number size);
+
+ // Memory management
+ cmsBool _cmsRegisterMemHandlerPlugin(cmsPluginBase* Plugin);
+@@ -205,28 +205,28 @@
+ cmsBool _cmsRegisterInterpPlugin(cmsPluginBase* Plugin);
+
+ // Parametric curves
+-cmsBool _cmsRegisterParametricCurvesPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterParametricCurvesPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Formatters management
+-cmsBool _cmsRegisterFormattersPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterFormattersPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Tag type management
+-cmsBool _cmsRegisterTagTypePlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterTagTypePlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Tag management
+-cmsBool _cmsRegisterTagPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterTagPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Intent management
+-cmsBool _cmsRegisterRenderingIntentPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterRenderingIntentPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Multi Process elements
+-cmsBool _cmsRegisterMultiProcessElementPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterMultiProcessElementPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Optimization
+-cmsBool _cmsRegisterOptimizationPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterOptimizationPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // Transform
+-cmsBool _cmsRegisterTransformPlugin(cmsPluginBase* Plugin);
++cmsBool _cmsRegisterTransformPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
+
+ // ---------------------------------------------------------------------------------------------------------
+
+@@ -263,7 +263,7 @@
+ cmsUInt16Number Country;
+
+ cmsUInt32Number StrW; // Offset to current unicode string
+- cmsUInt32Number Len; // Lenght in bytes
++ cmsUInt32Number Len; // Length in bytes
+
+ } _cmsMLUentry;
+
+@@ -330,9 +330,11 @@
+ cmsColorSpaceSignature ColorSpace;
+ cmsColorSpaceSignature PCS;
+ cmsUInt32Number RenderingIntent;
++
+ cmsUInt32Number flags;
+ cmsUInt32Number manufacturer, model;
+ cmsUInt64Number attributes;
++ cmsUInt32Number creator;
+
+ cmsProfileID ProfileID;
+
+@@ -585,6 +587,10 @@
+ cmsColorSpaceSignature EntryColorSpace;
+ cmsColorSpaceSignature ExitColorSpace;
+
++ // White points (informative only)
++ cmsCIEXYZ EntryWhitePoint;
++ cmsCIEXYZ ExitWhitePoint;
++
+ // Profiles used to create the transform
+ cmsSEQ* Sequence;
+
--- jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2013-09-06 11:29:03.000000000 -0700
-+++ jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-01-18 12:16:24.000000000 -0800
++++ jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-04-20 12:39:16.000000000 -0700
@@ -661,7 +661,12 @@
(sy2-sy1) != (jint)(dy2-dy1) ||
oglc->extraAlpha != 1.0f;
@@ -63333,7 +55764,7 @@
// just use the glDrawPixels() codepath
viaTexture = JNI_FALSE;
--- jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2013-09-06 11:29:03.000000000 -0700
-+++ jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2014-04-20 12:39:16.000000000 -0700
@@ -26,7 +26,7 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
@@ -63343,8 +55774,78 @@
#include <dlfcn.h>
#endif
#include "jni.h"
+--- jdk/src/share/native/sun/management/Flag.c 2013-09-06 11:29:03.000000000 -0700
++++ jdk/src/share/native/sun/management/Flag.c 2014-04-20 12:39:16.000000000 -0700
+@@ -95,12 +95,12 @@
+ return 0;
+ }
+
+- if (count == 0) {
++ if (count <= 0) {
+ JNU_ThrowIllegalArgumentException(env, 0);
+ return 0;
+ }
+
+- gsize = count * sizeof(jmmVMGlobal);
++ gsize = (size_t)count * sizeof(jmmVMGlobal);
+ globals = (jmmVMGlobal*) malloc(gsize);
+ if (globals == NULL) {
+ JNU_ThrowOutOfMemoryError(env, 0);
+--- jdk/src/share/native/sun/management/GcInfoBuilder.c 2013-09-06 11:29:03.000000000 -0700
++++ jdk/src/share/native/sun/management/GcInfoBuilder.c 2014-04-20 12:39:16.000000000 -0700
+@@ -59,12 +59,12 @@
+ return;
+ }
+
+- if (num_attributes == 0) {
++ if (num_attributes <= 0) {
+ JNU_ThrowIllegalArgumentException(env, "Invalid num_attributes");
+ return;
+ }
+
+- ext_att_info = (jmmExtAttributeInfo*) malloc(num_attributes *
++ ext_att_info = (jmmExtAttributeInfo*) malloc((size_t)num_attributes *
+ sizeof(jmmExtAttributeInfo));
+ if (ext_att_info == NULL) {
+ JNU_ThrowOutOfMemoryError(env, 0);
+@@ -78,7 +78,7 @@
+ return;
+ }
+
+- nativeTypes = (jchar*) malloc(num_attributes * sizeof(jchar));
++ nativeTypes = (jchar*) malloc((size_t)num_attributes * sizeof(jchar));
+ if (nativeTypes == NULL) {
+ free(ext_att_info);
+ JNU_ThrowOutOfMemoryError(env, 0);
+@@ -188,11 +188,16 @@
+ return 0;
+ }
+
++ if (ext_att_count <= 0) {
++ JNU_ThrowIllegalArgumentException(env, "Invalid ext_att_count");
++ return 0;
++ }
++
+ gc_stat.usage_before_gc = usageBeforeGC;
+ gc_stat.usage_after_gc = usageAfterGC;
+ gc_stat.gc_ext_attribute_values_size = ext_att_count;
+ if (ext_att_count > 0) {
+- gc_stat.gc_ext_attribute_values = (jvalue*) malloc(ext_att_count *
++ gc_stat.gc_ext_attribute_values = (jvalue*) malloc((size_t)ext_att_count *
+ sizeof(jvalue));
+ if (gc_stat.gc_ext_attribute_values == NULL) {
+ JNU_ThrowOutOfMemoryError(env, 0);
+@@ -212,7 +217,7 @@
+ }
+
+ // convert the ext_att_types to native types
+- nativeTypes = (jchar*) malloc(ext_att_count * sizeof(jchar));
++ nativeTypes = (jchar*) malloc((size_t)ext_att_count * sizeof(jchar));
+ if (nativeTypes == NULL) {
+ if (gc_stat.gc_ext_attribute_values != NULL) {
+ free(gc_stat.gc_ext_attribute_values);
--- jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2013-09-06 11:29:03.000000000 -0700
-+++ jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2013-12-01 11:14:31.000000000 -0800
++++ jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2014-04-20 12:39:16.000000000 -0700
@@ -29,7 +29,7 @@
#include "sun_management_HotSpotDiagnostic.h"
@@ -63355,7 +55856,7 @@
{
jmm_interface->DumpHeap0(env, outputfile, live);
--- jdk/src/solaris/back/util_md.h 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/back/util_md.h 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/back/util_md.h 2014-04-20 12:39:22.000000000 -0700
@@ -51,7 +51,7 @@
/* On little endian machines, convert java big endian numbers. */
@@ -63366,7 +55867,7 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
--- jdk/src/solaris/bin/ergo.c 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/bin/ergo.c 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/bin/ergo.c 2014-04-20 12:39:22.000000000 -0700
@@ -100,6 +100,27 @@
/* Compute physical memory by asking the OS */
uint64_t
@@ -63402,7 +55903,7 @@
+#endif
}
--- jdk/src/solaris/bin/ergo.h 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/bin/ergo.h 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/bin/ergo.h 2014-04-20 12:39:22.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -63415,7 +55916,7 @@
#include "java.h"
--- jdk/src/solaris/bin/ergo_i586.c 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/bin/ergo_i586.c 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/bin/ergo_i586.c 2014-04-20 12:39:22.000000000 -0700
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -63475,7 +55976,7 @@
+#endif
}
--- jdk/src/solaris/bin/java_md_solinux.c 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/bin/java_md_solinux.c 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/bin/java_md_solinux.c 2014-04-20 12:39:22.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -63534,7 +56035,7 @@
if (hSplashLib) {
void* sym = dlsym(hSplashLib, name);
--- jdk/src/solaris/bin/java_md_solinux.h 2013-09-06 11:29:05.000000000 -0700
-+++ jdk/src/solaris/bin/java_md_solinux.h 2014-01-18 12:16:32.000000000 -0800
++++ jdk/src/solaris/bin/java_md_solinux.h 2014-04-20 12:39:22.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/time.h>
#define CounterGet() (gethrtime()/1000)
@@ -63556,8 +56057,398 @@
#else /* Solaris */
static const char *system_dir = "/usr/jdk";
static const char *user_dir = "/jdk";
+--- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd 2013-09-06 11:29:06.000000000 -0700
++++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd 2014-04-20 12:39:22.000000000 -0700
+@@ -63,11 +63,59 @@
+ private /* final */ InputStream stdout;
+ private /* final */ InputStream stderr;
+
++ private static enum LaunchMechanism {
++ FORK(1),
++ POSIX_SPAWN(2);
++
++ private int value;
++ LaunchMechanism(int x) {value = x;}
++ };
++
++ /* On BSD, the default is to spawn */
++ private static final LaunchMechanism launchMechanism;
++ private static byte[] helperpath;
++
++ private static byte[] toCString(String s) {
++ if (s == null)
++ return null;
++ byte[] bytes = s.getBytes();
++ byte[] result = new byte[bytes.length + 1];
++ System.arraycopy(bytes, 0,
++ result, 0,
++ bytes.length);
++ result[result.length-1] = (byte)0;
++ return result;
++ }
++
++ static {
++ launchMechanism = AccessController.doPrivileged(
++ new PrivilegedAction<LaunchMechanism>()
++ {
++ public LaunchMechanism run() {
++ String javahome = System.getProperty("java.home");
++
++ helperpath = toCString(javahome + "/lib/jspawnhelper");
++ String s = System.getProperty(
++ "jdk.lang.Process.launchMechanism", "posix_spawn");
++
++ try {
++ return LaunchMechanism.valueOf(s.toUpperCase());
++ } catch (IllegalArgumentException e) {
++ throw new Error(s + " is not a supported " +
++ "process launch mechanism on this platform.");
++ }
++ }
++ });
++ }
++
+ /* this is for the reaping thread */
+ private native int waitForProcessExit(int pid);
+
+ /**
+- * Create a process using fork(2) and exec(2).
++ * Create a process. Depending on the mode flag, this is done by
++ * one of the following mechanisms.
++ * - fork(2) and exec(2)
++ * - posix_spawn(2)
+ *
+ * @param fds an array of three file descriptors.
+ * Indexes 0, 1, and 2 correspond to standard input,
+@@ -80,7 +128,8 @@
+ * output.
+ * @return the pid of the subprocess
+ */
+- private native int forkAndExec(byte[] prog,
++ private native int forkAndExec(int mode, byte[] helperpath,
++ byte[] prog,
+ byte[] argBlock, int argc,
+ byte[] envBlock, int envc,
+ byte[] dir,
+@@ -132,7 +181,9 @@
+ final boolean redirectErrorStream)
+ throws IOException {
+
+- pid = forkAndExec(prog,
++ pid = forkAndExec(launchMechanism.value,
++ helperpath,
++ prog,
+ argBlock, argc,
+ envBlock, envc,
+ dir,
+@@ -236,11 +287,10 @@
+ try { stderr.close(); } catch (IOException ignored) {}
+ }
+
+- /* This routine initializes JNI field offsets for the class */
+- private static native void initIDs();
++ private static native void init();
+
+ static {
+- initIDs();
++ init();
+ }
+
+ /**
+--- jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2013-09-06 11:29:06.000000000 -0700
++++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2014-04-20 12:39:22.000000000 -0700
+@@ -63,11 +63,61 @@
+ private /* final */ InputStream stdout;
+ private /* final */ InputStream stderr;
+
++ private static enum LaunchMechanism {
++ FORK(1),
++ VFORK(3);
++
++ private int value;
++ LaunchMechanism(int x) {value = x;}
++ };
++
++ /* default is VFORK on Linux */
++ private static final LaunchMechanism launchMechanism;
++ private static byte[] helperpath;
++
++ private static byte[] toCString(String s) {
++ if (s == null)
++ return null;
++ byte[] bytes = s.getBytes();
++ byte[] result = new byte[bytes.length + 1];
++ System.arraycopy(bytes, 0,
++ result, 0,
++ bytes.length);
++ result[result.length-1] = (byte)0;
++ return result;
++ }
++
++ static {
++ launchMechanism = AccessController.doPrivileged(
++ new PrivilegedAction<LaunchMechanism>()
++ {
++ public LaunchMechanism run() {
++ String javahome = System.getProperty("java.home");
++ String osArch = System.getProperty("os.arch");
++
++ helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
++ String s = System.getProperty(
++ "jdk.lang.Process.launchMechanism", "vfork");
++
++ try {
++ return LaunchMechanism.valueOf(s.toUpperCase());
++ } catch (IllegalArgumentException e) {
++ throw new Error(s + " is not a supported " +
++ "process launch mechanism on this platform.");
++ }
++ }
++ });
++ }
++
+ /* this is for the reaping thread */
+ private native int waitForProcessExit(int pid);
+
+ /**
+- * Create a process using fork(2) and exec(2).
++ * Create a process. Depending on the mode flag, this is done by
++ * one of the following mechanisms.
++ * - fork(2) and exec(2)
++ * - clone(2) and exec(2)
++ * - vfork(2) and exec(2)
+ *
+ * @param fds an array of three file descriptors.
+ * Indexes 0, 1, and 2 correspond to standard input,
+@@ -80,7 +130,8 @@
+ * output.
+ * @return the pid of the subprocess
+ */
+- private native int forkAndExec(byte[] prog,
++ private native int forkAndExec(int mode, byte[] helperpath,
++ byte[] prog,
+ byte[] argBlock, int argc,
+ byte[] envBlock, int envc,
+ byte[] dir,
+@@ -132,7 +183,9 @@
+ final boolean redirectErrorStream)
+ throws IOException {
+
+- pid = forkAndExec(prog,
++ pid = forkAndExec(launchMechanism.value,
++ helperpath,
++ prog,
+ argBlock, argc,
+ envBlock, envc,
+ dir,
+@@ -236,11 +289,10 @@
+ try { stderr.close(); } catch (IOException ignored) {}
+ }
+
+- /* This routine initializes JNI field offsets for the class */
+- private static native void initIDs();
++ private static native void init();
+
+ static {
+- initIDs();
++ init();
+ }
+
+ /**
+--- jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2013-09-06 11:29:06.000000000 -0700
++++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2014-04-20 12:39:22.000000000 -0700
+@@ -26,6 +26,8 @@
+ package java.lang;
+
+ import java.io.*;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+
+ /* java.lang.Process subclass in the UNIX environment.
+ *
+@@ -45,11 +47,65 @@
+ private DeferredCloseInputStream stdout_inner_stream;
+ private InputStream stderr_stream;
+
++ private static enum LaunchMechanism {
++ FORK(1),
++ POSIX_SPAWN(2);
++
++ private int value;
++ LaunchMechanism(int x) {value = x;}
++ };
++
++ /* On Solaris, the default is to spawn */
++ private static final LaunchMechanism launchMechanism;
++ private static byte[] helperpath;
++
++ private static byte[] toCString(String s) {
++ if (s == null)
++ return null;
++ byte[] bytes = s.getBytes();
++ byte[] result = new byte[bytes.length + 1];
++ System.arraycopy(bytes, 0,
++ result, 0,
++ bytes.length);
++ result[result.length-1] = (byte)0;
++ return result;
++ }
++
++ static {
++ launchMechanism = AccessController.doPrivileged(
++ new PrivilegedAction<LaunchMechanism>()
++ {
++ public LaunchMechanism run() {
++ String javahome = System.getProperty("java.home");
++ String osArch = System.getProperty("os.arch");
++ if (osArch.equals("x86")) {
++ osArch = "i386";
++ } else if (osArch.equals("x86_64")) {
++ osArch = "amd64";
++ }
++
++ helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
++ String s = System.getProperty(
++ "jdk.lang.Process.launchMechanism", "fork");
++
++ try {
++ return LaunchMechanism.valueOf(s.toUpperCase());
++ } catch (IllegalArgumentException e) {
++ throw new Error(s + " is not a supported " +
++ "process launch mechanism on this platform.");
++ }
++ }
++ });
++ }
++
+ /* this is for the reaping thread */
+ private native int waitForProcessExit(int pid);
+
+ /**
+- * Create a process using fork(2) and exec(2).
++ * Create a process. Depending on the mode flag, this is done by
++ * one of the following mechanisms.
++ * - fork(2) and exec(2)
++ * - posix_spawn(2)
+ *
+ * @param std_fds array of file descriptors. Indexes 0, 1, and
+ * 2 correspond to standard input, standard output and
+@@ -61,7 +117,8 @@
+ * if and only if it is <em>not</em> -1 on output.
+ * @return the pid of the subprocess
+ */
+- private native int forkAndExec(byte[] prog,
++ private native int forkAndExec(int mode, byte[] helperpath,
++ byte[] prog,
+ byte[] argBlock, int argc,
+ byte[] envBlock, int envc,
+ byte[] dir,
+@@ -76,7 +133,9 @@
+ final int[] std_fds,
+ final boolean redirectErrorStream)
+ throws IOException {
+- pid = forkAndExec(prog,
++ pid = forkAndExec(launchMechanism.value,
++ helperpath,
++ prog,
+ argBlock, argc,
+ envBlock, envc,
+ dir,
+@@ -294,10 +353,9 @@
+
+ }
+
+- /* This routine initializes JNI field offsets for the class */
+- private static native void initIDs();
++ private static native void init();
+
+ static {
+- initIDs();
++ init();
+ }
+ }
+--- jdk/src/solaris/classes/sun/awt/X11/XClipboard.java 2013-09-06 11:29:06.000000000 -0700
++++ jdk/src/solaris/classes/sun/awt/X11/XClipboard.java 2014-04-20 12:39:22.000000000 -0700
+@@ -84,7 +84,7 @@
+
+ protected synchronized void setContentsNative(Transferable contents) {
+ SortedMap formatMap = DataTransferer.getInstance().getFormatsForTransferable
+- (contents, DataTransferer.adaptFlavorMap(flavorMap));
++ (contents, DataTransferer.adaptFlavorMap(getDefaultFlavorTable()));
+ long[] formats = DataTransferer.keysToLongArray(formatMap);
+
+ if (!selection.setOwner(contents, formatMap, formats,
+@@ -123,7 +123,7 @@
+ private void checkChangeHere(Transferable contents) {
+ if (areFlavorListenersRegistered()) {
+ checkChange(DataTransferer.getInstance().
+- getFormatsForTransferableAsArray(contents, flavorMap));
++ getFormatsForTransferableAsArray(contents, getDefaultFlavorTable()));
+ }
+ }
+
+--- jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2013-09-06 11:29:07.000000000 -0700
++++ jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -49,6 +49,7 @@
+ import sun.awt.*;
+ import sun.font.FontConfigManager;
+ import sun.misc.PerformanceLogger;
++import sun.misc.ThreadGroupUtils;
+ import sun.print.PrintJob2D;
+ import sun.security.action.GetPropertyAction;
+ import sun.security.action.GetBooleanAction;
+@@ -311,13 +312,7 @@
+ }
+ PrivilegedAction<Void> a = new PrivilegedAction<Void>() {
+ public Void run() {
+- ThreadGroup mainTG = Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = mainTG.getParent();
+- while (parentTG != null) {
+- mainTG = parentTG;
+- parentTG = mainTG.getParent();
+- }
+- Thread shutdownThread = new Thread(mainTG, "XToolkt-Shutdown-Thread") {
++ Thread shutdownThread = new Thread(ThreadGroupUtils.getRootThreadGroup(), "XToolkt-Shutdown-Thread") {
+ public void run() {
+ XSystemTrayPeer peer = XSystemTrayPeer.getPeerInstance();
+ if (peer != null) {
+@@ -379,22 +374,16 @@
+ init();
+ XWM.init();
+ SunToolkit.setDataTransfererClassName(DATA_TRANSFERER_CLASS_NAME);
+-
+- PrivilegedAction<Thread> action = new PrivilegedAction() {
++ toolkitThread = AccessController.doPrivileged(new PrivilegedAction<Thread>() {
++ @Override
+ public Thread run() {
+- ThreadGroup currentTG = Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = currentTG.getParent();
+- while (parentTG != null) {
+- currentTG = parentTG;
+- parentTG = currentTG.getParent();
+- }
+- Thread thread = new Thread(currentTG, XToolkit.this, "AWT-XAWT");
++ Thread thread = new Thread(ThreadGroupUtils.getRootThreadGroup(), XToolkit.this, "AWT-XAWT");
++ thread.setContextClassLoader(null);
+ thread.setPriority(Thread.NORM_PRIORITY + 1);
+ thread.setDaemon(true);
+ return thread;
+ }
+- };
+- toolkitThread = AccessController.doPrivileged(action);
++ });
+ toolkitThread.start();
+ }
+ }
--- jdk/src/solaris/classes/sun/awt/X11FontManager.java 2013-09-06 11:29:07.000000000 -0700
-+++ jdk/src/solaris/classes/sun/awt/X11FontManager.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/classes/sun/awt/X11FontManager.java 2014-04-20 12:39:22.000000000 -0700
@@ -213,7 +213,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -63585,8 +56476,60 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
+--- jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-09-06 11:29:07.000000000 -0700
++++ jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -41,6 +41,7 @@
+ import sun.java2d.opengl.GLXGraphicsConfig;
+ import sun.java2d.xr.XRGraphicsConfig;
+ import sun.java2d.loops.SurfaceType;
++import sun.misc.ThreadGroupUtils;
+
+ /**
+ * This is an implementation of a GraphicsDevice object for a single
+@@ -424,23 +425,20 @@
+ // hook will have no effect)
+ shutdownHookRegistered = true;
+ PrivilegedAction<Void> a = new PrivilegedAction<Void>() {
++ @Override
+ public Void run() {
+- ThreadGroup mainTG = Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = mainTG.getParent();
+- while (parentTG != null) {
+- mainTG = parentTG;
+- parentTG = mainTG.getParent();
+- }
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
+ Runnable r = new Runnable() {
+- public void run() {
+- Window old = getFullScreenWindow();
+- if (old != null) {
+- exitFullScreenExclusive(old);
+- setDisplayMode(origDisplayMode);
+- }
++ @Override
++ public void run() {
++ Window old = getFullScreenWindow();
++ if (old != null) {
++ exitFullScreenExclusive(old);
++ setDisplayMode(origDisplayMode);
+ }
+- };
+- Thread t = new Thread(mainTG, r,"Display-Change-Shutdown-Thread-"+screen);
++ }
++ };
++ Thread t = new Thread(rootTG, r, "Display-Change-Shutdown-Thread-" + screen);
+ t.setContextClassLoader(null);
+ Runtime.getRuntime().addShutdownHook(t);
+ return null;
--- jdk/src/solaris/classes/sun/net/PortConfig.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/src/solaris/classes/sun/net/PortConfig.java 2014-01-18 12:16:26.000000000 -0800
++++ jdk/src/solaris/classes/sun/net/PortConfig.java 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -63642,7 +56585,7 @@
+ } else if (os.startsWith("SunOS")) {
+ defaultLower = 32768;
+ defaultUpper = 65535;
-+ } else if (os.contains("OS X")) {
++ } else if (os.contains("OS X") || os.endsWith("BSD")) {
+ defaultLower = 49152;
+ defaultUpper = 65535;
+ } else {
@@ -63678,7 +56621,7 @@
+ }
+}
--- jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-12-01 11:14:32.000000000 -0800
++++ jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-04-20 12:39:22.000000000 -0700
@@ -26,9 +26,11 @@
package sun.nio.ch;
@@ -63706,7 +56649,7 @@
// The pollfd array for results from devpoll driver
private final AllocatedNativeObject pollArray;
--- jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-12-01 11:14:32.000000000 -0800
++++ jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-04-20 12:39:22.000000000 -0700
@@ -26,9 +26,11 @@
package sun.nio.ch;
@@ -63757,7 +56700,7 @@
}
}
--- jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2013-12-01 11:14:32.000000000 -0800
++++ jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2014-04-20 12:39:22.000000000 -0700
@@ -25,9 +25,14 @@
package sun.nio.ch;
@@ -63786,7 +56729,7 @@
// special update status to indicate that it should be ignored
private static final byte IGNORE = -1;
--- jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2014-01-18 12:16:27.000000000 -0800
++++ jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2014-04-20 12:39:22.000000000 -0700
@@ -180,6 +180,10 @@
SctpNet.throwAlreadyBoundException();
InetSocketAddress isa = (local == null) ?
@@ -63799,7 +56742,7 @@
InetSocketAddress boundIsa = Net.localAddress(fd);
port = boundIsa.getPort();
--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-04-20 12:39:22.000000000 -0700
@@ -70,6 +70,8 @@
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
if (osname.equals("Darwin") || osname.contains("OS X"))
@@ -63810,7 +56753,7 @@
}
}
--- jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2013-09-06 11:29:08.000000000 -0700
-+++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-04-20 12:39:22.000000000 -0700
@@ -129,6 +129,7 @@
static boolean isBSD() {
@@ -63819,5613 +56762,64 @@
osname.contains("OS X"));
}
---- jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 2013-09-06 11:29:09.000000000 -0700
-+++ jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 2014-01-18 12:16:27.000000000 -0800
-@@ -1,1673 +1,1403 @@
--." 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
--." under the terms of the GNU General Public License version 2 only, as
--." published by the Free Software Foundation.
--."
--." This code is distributed in the hope that it will be useful, but WITHOUT
--." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--." version 2 for more details (a copy is included in the LICENSE file that
--." accompanied this code).
--."
--." You should have received a copy of the GNU General Public License version
--." 2 along with this work; if not, write to the Free Software Foundation,
--." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--."
--." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--." or visit www.oracle.com if you need additional information or have any
--." questions.
--."
--.TH jarsigner 1 "05 Jul 2012"
--
--.LP
--.SH "̾Á°"
--jarsigner \- JAR½ð̾¤ª¤è¤Ó¸¡¾Ú¥Ä¡¼¥ë
--.LP
--.LP
--Java ARchive(JAR)¥Õ¥¡¥¤¥ë¤Î½ð̾¤òÀ¸À®¤·¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
--.LP
-+'\" t
-+.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-+.\" Title: jarsigner
-+.\" Language: English
-+.\" Date: 2013ǯ8·î6Æü
-+.\" SectDesc: ¥»¥­¥å¥ê¥Æ¥£¡¦¥Ä¡¼¥ë
-+.\" Software: JDK 7
-+.\" Arch: ÈÆÍÑ
-+.\"
-+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+.\"
-+.\" This code is free software; you can redistribute it and/or modify it
-+.\" under the terms of the GNU General Public License version 2 only, as
-+.\" published by the Free Software Foundation.
-+.\"
-+.\" This code is distributed in the hope that it will be useful, but WITHOUT
-+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+.\" version 2 for more details (a copy is included in the LICENSE file that
-+.\" accompanied this code).
-+.\"
-+.\" You should have received a copy of the GNU General Public License version
-+.\" 2 along with this work; if not, write to the Free Software Foundation,
-+.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+.\"
-+.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+.\" or visit www.oracle.com if you need additional information or have any
-+.\" questions.
-+.\"
-+.pl 99999
-+.TH "jarsigner" "1" "2013ǯ8·î6Æü" "JDK 7" "¥»¥­¥å¥ê¥Æ¥£¡¦¥Ä¡¼¥ë"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+.SH "NAME"
-+jarsigner \- Java¥¢¡¼¥«¥¤¥Ö(JAR)¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ½ð̾¤ª¤è¤Ó¸¡¾Ú¤ò¹Ô¤¤¤Þ¤¹¡£
- .SH "·Á¼°"
--.LP
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
--\fP\f3jarsigner\fP [ options ] jar\-file alias
--.fl
--\f3jarsigner\fP \-verify [ options ] jar\-file [alias...]
--.fl
--.fi
--
--.LP
--.LP
--jarsigner¤Î\-verify¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢jarsigner¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\-keystore¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
--.LP
-+\fIjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\fIjarsigner\fR \fI\-verify\fR [ \fIoptions\fR ] \fIjar\-file\fR [\fIalias \&.\&.\&.\fR]
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fIoptions\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verify
-+.RS 4
-+\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\fI\-keystore\fR¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤷ¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤ê½ÅÂç¤Ê·Ù¹ð¤¬¸¡½Ð¤µ¤ì¤ë¤È¡¢¥á¥Ã¥»¡¼¥¸¡Öjar¤¬¸¡¾Ú¤µ¤ì¤Þ¤·¤¿¡£½ð̾¼Ô¥¨¥é¡¼¡×¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\fIjar\-file\fR
-+.RS 4
-+½ð̾¤µ¤ì¤ëJAR¥Õ¥¡¥¤¥ë¡£
-+.RE
-+.PP
-+\fIalias\fR
-+.RS 4
-+ÊÌ̾¤Ï¡¢\fI\-keystore\fR¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
-+.RE
- .SH "ÀâÌÀ"
--.LP
--.LP
--\f3jarsigner\fP¥Ä¡¼¥ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÌÜŪ¤Ç»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 3
--1.
--Java ARchive(JAR)¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëÌÜŪ
--.TP 3
--2.
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ
--.RE
--
--.LP
--.LP
--JARµ¡Ç½¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¥¤¥á¡¼¥¸¡¢¥µ¥¦¥ó¥É¤ª¤è¤Ó¤½¤Î¾¤Î¥Ç¥¸¥¿¥ë¡¦¥Ç¡¼¥¿¤òñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥±¡¼¥¸²½¤Ç¤­¤ë¤Î¤Ç¡¢¥Õ¥¡¥¤¥ë¤ò¿×®¤«¤ÄÍưפËÇÛÉۤǤ­¤Þ¤¹¡£³«È¯¼Ô¤Ï¡¢jar(1)¤È¤¤¤¦Ì¾Á°¤Î¥Ä¡¼¥ë¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£(µ»½ÑŪ¤Ê´ÑÅÀ¤«¤é¸À¤¨¤Ð¡¢¤¹¤Ù¤Æ¤ÎZIP¥Õ¥¡¥¤¥ë¤âJAR¥Õ¥¡¥¤¥ë¤È¤ß¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢\f3jar\fP¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï\f3jarsigner\fP¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢META\-INF/MANIFEST.MF¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£)
--.LP
--.LP
--\f2¥Ç¥¸¥¿¥ë½ð̾\fP¤Ï¡¢¤Ê¤ó¤é¤«¤Î¥Ç¡¼¥¿(¡Ö½ð̾¡×¤ÎÂоݤȤʤë¥Ç¡¼¥¿)¤È¡¢¥¨¥ó¥Æ¥£¥Æ¥£(¿Í¡¢²ñ¼Ò¤Ê¤É)¤ÎÈëÌ©¸°¤È¤Ë´ð¤Å¤¤¤Æ·×»»¤µ¤ì¤ë¥Ó¥Ã¥ÈÎó¤Ç¤¹¡£¼ê½ñ¤­¤Î½ð̾ƱÍÍ¡¢¥Ç¥¸¥¿¥ë½ð̾¤Ë¤Ï¿¤¯¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--½ð̾¤ÎÀ¸À®¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ÈÂФˤʤë¸ø³«¸°¤ò»ÈÍѤ·¤Æ·×»»¤ò¹Ô¤¦¤³¤È¤Ç¡¢¥Ç¥¸¥¿¥ë½ð̾¤¬ËÜʪ¤«¤É¤¦¤«¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--ÈëÌ©¸°¤¬Â¾¿Í¤ËÃΤé¤ì¤Ê¤¤¸Â¤ê¡¢¥Ç¥¸¥¿¥ë½ð̾¤Îµ¶Â¤¤ÏÉÔ²Äǽ¤Ç¤¹¡£
--.TP 2
--o
--¥Ç¥¸¥¿¥ë½ð̾¤Ï¡¢¤½¤Î½ð̾¤¬ÉÕ¤¤¤¿¥Ç¡¼¥¿¤Î¤ß¤òÂоݤȤ¹¤ë¤â¤Î¤Ç¤¢¤ê¡¢Â¾¤Î¥Ç¡¼¥¿¤Î½ð̾¤È¤·¤Æµ¡Ç½¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
--.TP 2
--o
--½ð̾ÉÕ¤­¤Î¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î½ð̾¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤¬ËÜʪ¤Ç¤Ï¤Ê¤¤¤³¤È¤¬¸¡¾Ú¤µ¤ì¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥¨¥ó¥Æ¥£¥Æ¥£¤Î½ð̾¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´ØÏ¢¤¹¤ë¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¸ø³«¸°¤òǧ¾Ú¤¹¤ë1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¾ÚÌÀ½ñ¤âɬÍפǤ¹¡£\f2¾ÚÌÀ½ñ\fP¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤¬È¯¹Ô¤·¤¿¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Ç¡¢Ê̤ʥ¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤¬ÆÃÄê¤ÎÃͤǤ¢¤ë¤³¤È¤ò¾ÚÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¡¢\f2¥­¡¼¥¹¥È¥¢\fP¤Ë´Þ¤Þ¤ì¤ë¸°¤È¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤Æ¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¡¢ÈëÌ©¸°¡¢¤ª¤è¤ÓÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¤¿¤á¤ÎX.509¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬¼ý¤á¤é¤ì¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢¤ÎºîÀ®¤È´ÉÍý¤Ë¤Ï¡¢keytool(1)¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤ËÂФ¹¤ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ÚÌÀ½ñ¤Î¥³¥Ô¡¼¤Ê¤É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\f3jarsigner\fP¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ëÆâ(½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ëÆâ)¤Ë¤¢¤ë¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¤½¤Î¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤Ï¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤à½ð̾¤òÀ¸À®¤¹¤ë¤Î¤Ç¡¢¥·¥¹¥Æ¥à¤ä¥Ç¥×¥í¥¤¥ä(Java Plug\-in¤ò´Þ¤à)¤ÏJAR¥Õ¥¡¥¤¥ë¤¬½ð̾¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´ÖÃæ¤Ë½ð̾¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢API¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é¥¿¥¤¥à¥¹¥¿¥ó¥×¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¸½»þÅÀ¤Ç¤Ï¡¢\f3jarsigner\fP¤Ç½ð̾¤Ç¤­¤ë¤Î¤Ï¡¢SDK¤Îjar(1)¥Ä¡¼¥ë¤ÇºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Î¤ß¤Ç¤¹¡£(JAR¥Õ¥¡¥¤¥ë¤ÏZIP¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢JAR¥Õ¥¡¥¤¥ë¤Ë¤ÏMETA\-INF/MANIFEST.MF¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢\f3jarsigner\fP¤¬ZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ë¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£)
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f3jarsigner\fP¤ÏJAR(¤Þ¤¿¤ÏZIP)¥Õ¥¡¥¤¥ë¤Ë\f2½ð̾¤·¤Þ¤¹\fP¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò\f2¸¡¾Ú\fP¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-verify\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤Ï¡¢°ì°Õ¤Î\f2ÊÌ̾\fP¤ò²ð¤·¤Æ¥¢¥¯¥»¥¹¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®¤ËɬÍפÊÈëÌ©¸°¤ò´Þ¤à¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤ÎÎã¤Ï¡¢working¥Ç¥£¥ì¥¯¥È¥ê¤Îmystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë´Þ¤Þ¤ì¤ëÊÌ̾duke¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢MyJARFile.jar¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢MyJARFile.jar¤Ï½ð̾ÉÕ¤­¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢ÈëÌ©¸°¤â¥­¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤È°ã¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤Î¾ì½ê
--.LP
--.LP
--\f3jarsigner\fP¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥­¡¼¥¹¥È¥¢¤ÎURL¤ò»ØÄꤹ¤ë\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\f2user.home\fP¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·è¤Þ¤ë¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î\f2.keystore\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£Solaris¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢\f2user.home\fP¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¥æ¡¼¥¶¡¼¤Îhome¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Ï¡¢\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£URL¤È¤·¤Æ\f2NONE\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢null¤Î¥¹¥È¥ê¡¼¥à¤¬\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£\f2NONE\fP¤Ï¡¢\f2KeyStore\fP¤¬¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¤¿¤È¤¨¤Ð¡¢¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¡¦¥Ç¥Ð¥¤¥¹¾å¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¤Ê¤É¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ
--.LP
--.LP
--\f2java.security\fP¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë\f2KeyStore\fP¥¯¥é¥¹¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤ª¤è¤Ó¾ðÊó¤ÎÊѹ¹¤ò¹Ô¤¦¤¿¤á¤Î¡¢ÌÀ³Î¤ËÄêµÁ¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¸ÇÄê¼ÂÁõ¤È¤·¤Æ¤Ï¡¢¤½¤ì¤¾¤ì¤¬ÆÃÄê¤Î\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤òÂоݤȤ¹¤ëÊ£¿ô¤Î°Û¤Ê¤ë¼ÂÁõ¤¬Â¸ºß²Äǽ¤Ç¤¹¡£
--.LP
--.LP
--¸½ºß¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤â¤Î¤È¤·¤Æ¡¢\f3keytool\fP¤È\f3jarsigner\fP¤Î2¤Ä¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë¤È¡¢\f3Policy Tool\fP¤È¤¤¤¦Ì¾Á°¤Î1¤Ä¤ÎGUI¥Ù¡¼¥¹¤Î¥Ä¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£\f2KeyStore\fP¤Ï¸ø³«¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Java 2 SDK¥æ¡¼¥¶¡¼¤ÏKeyStore¤ò»ÈÍѤ¹¤ë¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âºîÀ®¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Ë¤Ï¡¢Sun Microsystems¤¬Ä󶡤¹¤ëÁȹþ¤ß¤Î¥Ç¥Õ¥©¥ë¥È¤Î¼ÂÁõ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢JKS¤È¤¤¤¦Ì¾Á°¤ÎÆȼ«¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(·Á¼°)¤òÍøÍѤ¹¤ë¤â¤Î¤Ç¡¢¥­¡¼¥¹¥È¥¢¤ò¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¼ÂÁõ¤Ç¤Ï¡¢¸Ä¡¹¤ÎÈëÌ©¸°¤Ï¸ÄÊ̤Υѥ¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÀ°¹çÀ­¤â(ÈëÌ©¸°¤È¤ÏÊ̤Î)¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
--.LP
--.LP
--¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ï¡¢¥×¥í¥Ð¥¤¥À¥Ù¡¼¥¹¤Ç¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢\f2KeyStore\fP¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬¡Ö¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡×(SPI)¤Ë´ð¤Å¤¤¤Æ¼ÂÁõ¤µ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢Âбþ¤¹¤ë\f2KeystoreSpi\fPÃê¾Ý¥¯¥é¥¹(¤³¤ì¤â\f2java.security\fP¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹)¤¬¤¢¤ê¡¢¤³¤Î¥¯¥é¥¹¤¬¡¢¡Ö¥×¥í¥Ð¥¤¥À¡×¤¬¼ÂÁõ¤¹¤ëɬÍפΤ¢¤ëService Provider Interface¤Î¥á¥½¥Ã¥É¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£(¤³¤³¤Ç¡¢¡Ö¥×¥í¥Ð¥¤¥À¡×¤È¤Ï¡¢Java Security API¤Ë¤è¤Ã¤Æ¥¢¥¯¥»¥¹²Äǽ¤Ê¥µ¡¼¥Ó¥¹¤Î¥µ¥Ö¥»¥Ã¥È¤ËÂФ·¡¢¤½¤Î¸ÇÄê¼ÂÁõ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î½¸¹ç¤Î¤³¤È¤Ç¤¹¡£)¤·¤¿¤¬¤Ã¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¤Ë¤Ï¡¢
--.na
--\f2Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍÑ¥×¥í¥Ð¥¤¥À¤Î¼ÂÁõÊýË¡\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬¡Ö¥×¥í¥Ð¥¤¥À¡×¤ò¼ÂÁõ¤·¡¢KeystoreSpi¥µ¥Ö¥¯¥é¥¹¤Î¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢\f2KeyStore\fP¥¯¥é¥¹¤¬Ä󶡤¹¤ëgetInstance¥Õ¥¡¥¯¥È¥ê¡¦¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢ÍÍ¡¹¤Ê¥×¥í¥Ð¥¤¥À¤«¤é°Û¤Ê¤ë\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Ï¡¢¥­¡¼¥¹¥È¥¢¾ðÊó¤Î³ÊǼ·Á¼°¤È¥Ç¡¼¥¿·Á¼°¤òÄêµÁ¤¹¤ë¤È¤È¤â¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÈëÌ©¸°¤È¥­¡¼¥¹¥È¥¢¼«ÂΤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤·¤Þ¤¹¡£°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ë¤Ï¡¢¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
--.LP
--.LP
--\f3keytool\fP¤Ï¡¢Ç¤°Õ¤Î¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢¼ÂÁõ¤ÇÆ°ºî¤·¤Þ¤¹¡£(¤³¤ì¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éÅϤµ¤ì¤¿¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ°·¤¤¡¢¤³¤ì¤òFileInputStream¤ËÊÑ´¹¤·¤Æ¡¢FileInputStream¤«¤é¥­¡¼¥¹¥È¥¢¤Î¾ðÊó¤ò¥í¡¼¥É¤·¤Þ¤¹¡£)°ìÊý¡¢\f3jarsigner\fP¥Ä¡¼¥ë¤È\f3policytool\fP¥Ä¡¼¥ë¤Ï¡¢URL¤Ç»ØÄê²Äǽ¤ÊǤ°Õ¤Î¾ì½ê¤«¤é¥­¡¼¥¹¥È¥¢¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--\f3jarsigner\fP¤È\f3keytool\fP¤Î¾ì¹ç¡¢\f2\-storetype\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f3Policy Tool\fP¤Î¾ì¹ç¤Ï¡¢¡ÖEdit¡×¥á¥Ë¥å¡¼¤Î¡ÖChange Keystore¡×¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
--.LP
--.LP
--¥æ¡¼¥¶¡¼¤¬¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢Ã±½ã¤Ë¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ˴ð¤Å¤¤¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ï\f2java.security\fP¤È¸Æ¤Ð¤ì¡¢SDK¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\f2java.home\fP/lib/securityÆâ¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢\f2java.home\fP¤Ï¼Â¹Ô»þ´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê(SDK¤Î\f2jre\fP¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤ÏJava 2 Runtime Environment¤Î¥È¥Ã¥×¥ì¥Ù¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê)¤Ç¤¹¡£
--.LP
--.LP
--³Æ¥Ä¡¼¥ë¤Ï¡¢\f2keystore.type\fP¤ÎÃͤò¼èÆÀ¤·¡¢¤³¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥Ð¥¤¥À¤òÄ´¤Ù¤Þ¤¹¡£ÌÜŪ¤Î¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥×¥í¥Ð¥¤¥À¤«¤é¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Þ¤¹¡£
--.LP
--.LP
--\f2KeyStore\fP¥¯¥é¥¹¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤ëstatic¥á¥½¥Ã¥É\f2getDefaultType\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ä¥¢¥×¥ì¥Ã¥È¤«¤é\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥³¡¼¥É¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤Ç»ØÄꤵ¤ì¤¿¥¿¥¤¥×)¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ïjks(Sun¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- keystore.type=jks
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Ãí°Õ: ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢JKS¤Èjks¤ÏƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.LP
--.LP
--³Æ¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢pkcs12¤È¸Æ¤Ð¤ì¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- keystore.type=pkcs12
--.fl
--\fP
--.fi
--
--.LP
--.LP
--PKCS#11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Î¾ÜºÙ¤Ï¡¢Java PKCS#11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Ë¤¢¤ë
--.na
--\f2KeyTool¤ÈJarSigner\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à
--.LP
--.LP
--\f3jarsigner\fP¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¼¡¤Î¤¤¤º¤ì¤«¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--SHA1¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿DSA(¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à)
--.TP 2
--o
--SHA256¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿RSA¥¢¥ë¥´¥ê¥º¥à
--.TP 2
--o
--SHA256¤ÈECDSA(Âʱ߶ÊÀþ¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à)¤ò»ÈÍѤ·¤¿EC(Âʱ߶ÊÀþ)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
--.RE
--
--.LP
--.LP
--¶ñÂÎŪ¤Ë¤Ï¡¢½ð̾¼Ô¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤¬DSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA1withDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬RSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA256withRSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬EC¸°¤Ç¤¢¤ë¾ì¹ç¡¢\f3jarsigner\fP¤ÏSHA256withECDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Þ¤¹¡£
--.LP
--.LP
--¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£
--.LP
--.SS
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë
--.LP
--.LP
--\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤¿¾ì¹ç¡¢½ÐÎϤµ¤ì¤ë½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÏÆþÎÏJAR¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢¼¡¤Î2¤Ä¤ÎÄɲåե¡¥¤¥ë¤¬META\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--.SF³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Õ¥¡¥¤¥ë
--.TP 2
--o
--.DSA¡¢.RSA¤Þ¤¿¤Ï.EC¤ò³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
--.RE
--
--.LP
--.LP
--¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\f2\-sigFile\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¤È¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
--\-sigFile MKSIGN
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¤³¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤Ï¤½¤ì¤¾¤ìMKSIGN.SF¤ÈMKSIGN.DSA¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-sigfile\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ(_)¤ËÃÖ¤­´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£»ÈÍѤǤ­¤ëʸ»ú¤Ï¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ(_)¡¢¥Ï¥¤¥Õ¥ó¤Ç¤¹¡£
--.LP
--\f3½ð̾(.SF)¥Õ¥¡¥¤¥ë\fP
--.LP
--.LP
--½ð̾¥Õ¥¡¥¤¥ë(.SF¥Õ¥¡¥¤¥ë)¤Ï¡¢\f3jarsigner\fP¤Ç½ð̾¤òÉÕ¤±¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¾ï¤Ë´Þ¤Þ¤ì¤ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤È»÷¤Æ¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëƱÍÍ¡¢.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë¡¢¼¡¤Î3¤Ä¤Î¹Ô¤¬¤¢¤ê¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--¥Õ¥¡¥¤¥ë̾
--.TP 2
--o
--»ÈÍѤµ¤ì¤Æ¤¤¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à(SHA)¤Î̾Á°
--.TP 2
--o
--SHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
--.RE
--
--.LP
--.LP
--¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎSHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¡¦¥Ç¡¼¥¿¤Î¥À¥¤¥¸¥§¥¹¥È(¥Ï¥Ã¥·¥å)¤Ë¤Ê¤ê¤Þ¤¹¡£°ìÊý¡¢.SF¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¤³¤ì¤é3¹Ô¤Î¥Ï¥Ã¥·¥å¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--½ð̾¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ÇÀâÌÀ¤¹¤ë¤è¤¦¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤Î¸ºß¤Ë¤è¤Ã¤Æ¸¡¾Ú¤ÎºÇŬ²½¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
--.LP
--\f3½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë\fP
--.LP
--.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï½ð̾¤¬ÉÕ¤±¤é¤ì¡¢½ð̾¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤âÉä¹æ²½¤µ¤ì¤¿·Á¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ï¡¢½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤·¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ï¡¢»ÈÍѤµ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Ë±þ¤¸¤Æ.DSA¡¢.RSA¡¢.EC¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
--.SS
--½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×
--.LP
--.LP
--\f2jarsigner\fP¥Ä¡¼¥ë¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤·¤ÆÊݸ¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f2jarsigner\fP¤ÏÂåÂؽð̾µ¡¹½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤Ï¾Êά²Äǽ¤Ç¡¢½ð̾»þ¤Ë¼¡¤Î³Æ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--\f2\-tsa url\fP
--.TP 2
--o
--\f2\-tsacert alias\fP
--.TP 2
--o
--\f2\-altsigner class\fP
--.TP 2
--o
--\f2\-altsignerpath classpathlist\fP
--.RE
--
--.LP
--.LP
--¤³¤ì¤é¤Î³Æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.LP
--.SS
--JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¸å¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
--.LP
--.RS 3
--.TP 3
--1.
--.SF¥Õ¥¡¥¤¥ë¼«ÂΤνð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
--.br
--.br
--¤³¤Î¼ê½ç¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(.DSA)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë½ð̾¤¬¡¢¼ÂºÝ¤Ë¡¢¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£.DSA¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¸ø³«¸°¤Î¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤Î¼ê½ç¤Ç¤Ï¡¢ÌÜŪ¤Î½ð̾¤¬¡¢Âбþ¤¹¤ë½ð̾(.SF)¥Õ¥¡¥¤¥ëÆâ¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¡¢.SF¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
--.TP 3
--2.
--.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Î¥À¥¤¥¸¥§¥¹¥È¤ò¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
--.br
--.br
--.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¼ÂºÝ¤Ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¼ê½ç¤Ë¸¡¾Ú¤¬¿Ê¤ß¤Þ¤¹¡£
--.br
--.br
--¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤¿¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹(½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£
--.br
-+.PP
-+\fIjarsigner\fR¥Ä¡¼¥ë¤Ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÌÜŪ¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+Java¥¢¡¼¥«¥¤¥Ö(JAR)¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëÌÜŪ¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ¡£
-+.RE
-+.PP
-+JARµ¡Ç½¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¥¤¥á¡¼¥¸¡¢¥µ¥¦¥ó¥É¤ª¤è¤Ó¤½¤Î¾¤Î¥Ç¥¸¥¿¥ë¡¦¥Ç¡¼¥¿¤òñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥±¡¼¥¸²½¤Ç¤­¤ë¤Î¤Ç¡¢¥Õ¥¡¥¤¥ë¤ò¿×®¤«¤ÄÍưפËÇÛÉۤǤ­¤Þ¤¹¡£\fIjar\fR¤È¤¤¤¦Ì¾Á°¤Î¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¡¢³«È¯¼Ô¤ÏJAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£(µ»½ÑŪ¤Ê´ÑÅÀ¤«¤é¸À¤¨¤Ð¡¢¤¹¤Ù¤Æ¤ÎZIP¥Õ¥¡¥¤¥ë¤âJAR¥Õ¥¡¥¤¥ë¤È¤ß¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢jar¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï\fIjarsigner\fR¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£)
-+.PP
-+¥Ç¥¸¥¿¥ë½ð̾¤Ï¡¢¤Ê¤ó¤é¤«¤Î¥Ç¡¼¥¿(½ð̾¤ÎÂоݤȤʤë¥Ç¡¼¥¿)¡¢¤ª¤è¤Ó¥¨¥ó¥Æ¥£¥Æ¥£(¿Í¡¢²ñ¼Ò¤Ê¤É)¤ÎÈëÌ©¸°¤«¤é·×»»¤µ¤ì¤ë¥Ó¥Ã¥È¤Îʸ»úÎó¤Ç¤¹¡£¼ê½ñ¤­¤Î½ð̾ƱÍÍ¡¢¥Ç¥¸¥¿¥ë½ð̾¤Ë¤Ï¿¤¯¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾¤ÎÀ¸À®¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤ò»ÈÍѤ¹¤ë·×»»¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤¬ËÜʪ¤Ç¤¢¤ë¤³¤È¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+ÈëÌ©¸°¤¬Â¾¿Í¤ËÃΤé¤ì¤Ê¤¤¸Â¤ê¡¢¥Ç¥¸¥¿¥ë½ð̾¤Îµ¶Â¤¤ÏÉÔ²Äǽ¤Ç¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¤³¤ì¤Ï¡¢½ð̾¤¬ÉÕ¤¤¤¿¥Ç¡¼¥¿¤Îµ¡Ç½¤Ç¤¢¤ê¡¢Â¾¤Î¥Ç¡¼¥¿¤Î½ð̾¤È¤Ê¤ë¤è¤¦¤ËÍ×µá¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+½ð̾ÉÕ¤­¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¡¢½ð̾¤Ë¤è¤Ã¤ÆËÜʪ¤Ç¤¢¤ë¤È¸¡¾Ú¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.PP
-+¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥¨¥ó¥Æ¥£¥Æ¥£¤Î½ð̾¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´ØÏ¢¤¹¤ë¸ø³«¸°/ÈëÌ©¸°¤Î¥Ú¥¢¤È¡¢¸ø³«¸°¤òǧ¾Ú¤¹¤ë1¤Ä°Ê¾å¤Î¾ÚÌÀ½ñ¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÚÌÀ½ñ¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤«¤é¤Î¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Ç¡¢Ê̤Υ¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤¬ÆÃÄê¤ÎÃͤò»ý¤Ä¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢¥­¡¼¥¹¥È¥¢¤«¤é¤Î¸°¤È¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤Æ¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¡¢ÈëÌ©¸°¡¢¤ª¤è¤ÓÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¡¢ÈëÌ©¸°¤Ë´ØÏ¢¤·¤¿X\&.509¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¤¹¡£\fIkeytool\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢¤òºîÀ®¤ª¤è¤Ó´ÉÍý¤·¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢Æäˡ¢¥Õ¥¡¥¤¥ë¤Ø¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤Î¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Î¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢ÆâÉô(½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ëÆâ)¤Î¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¥Ç¥¸¥¿¥ë½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢½ð̾¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´ÖÃæ¤ËJAR¥Õ¥¡¥¤¥ë¤¬½ð̾¤µ¤ì¤¿¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥·¥¹¥Æ¥à¤ä¥Ç¥×¥í¥¤¥ä(Java Plug\-in¤ò´Þ¤à)¤¬¥Á¥§¥Ã¥¯¤Ç¤­¤ë¡¢¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤à½ð̾¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢API¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¥¿¥¤¥à¥¹¥¿¥ó¥×¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£
-+.PP
-+¸½»þÅÀ¤Ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjar\fR¥³¥Þ¥ó¥É¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Î¤ß¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤ÏZIP¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢JAR¥Õ¥¡¥¤¥ë¤Ë¤Ï\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤â´Þ¤Þ¤ì¤Æ¤¤¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£\fIMETA\-INF/MANIFEST\&.MF\fR¥Õ¥¡¥¤¥ë¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤ÆZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëºÝ¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Î\fIjarsigner\fR¥³¥Þ¥ó¥É¤ÎÆ°ºî¤Ç¤Ï¡¢JAR¤Þ¤¿¤ÏZIP¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£\fI\-verify\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¸å¤Ë½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤Î¸¡¾Ú¤â»î¹Ô¤·¤Þ¤¹¡£¸¡¾Ú¥¨¥é¡¼¤Þ¤¿¤Ï¤½¤Î¾¤ÎÌäÂ꤬ȯÀ¸¤¹¤ë¤È¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê½ÅÂç¤Ê·Ù¹ð¤¬¥¨¥é¡¼¤È¤·¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£¥¨¥é¡¼¤È·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾"
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢°ì°Õ¤ÎÊÌ̾¤ò»ÈÍѤ·¤Æ¥¢¥¯¥»¥¹¤µ¤ì¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®¤ËɬÍפÊÈëÌ©¸°¤ò´Þ¤à¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIworking\fR¥Ç¥£¥ì¥¯¥È¥ê¤Î\fImystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë´Þ¤Þ¤ì¤ëÊÌ̾\fIduke\fR¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢\fIMyJARFile\&.jar\fR¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢\fIMyJARFile\&.jar\fR¤Ï½ð̾ÉÕ¤­¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-storepass <keystore password>
-+ \-keypass <private key password> MyJARFile\&.jar duke
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢ÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£Æ±Íͤˡ¢ÈëÌ©¸°¤â¥­¡¼¥¹¥È¥¢Æâ¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤¿¤á¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥È¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¥ï¡¼¥É¤ÈƱ¤¸¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤Î¾ì½ê"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥­¡¼¥¹¥È¥¢¤ÎURL¤ò»ØÄꤹ¤ë\fI\-keystore\fR¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\fIuser\&.home\fR¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·è¤Þ¤ë¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î\fI\&.keystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£Oracle Solaris¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢\fIuser\&.home\fR¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ç¥Õ¥©¥ë¥ÈÀßÄꤵ¤ì¤Þ¤¹¡£
-+.PP
-+\fI\-keystore\fR¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Ï¡¢\fIKeyStore\&.load\fR¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£URL¤È¤·¤Æ\fINONE\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢null¤Î¥¹¥È¥ê¡¼¥à¤¬\fIKeyStore\&.load\fR¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£\fINONE\fR¤Ï¡¢\fIKeyStore\fR¥¯¥é¥¹¤¬¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¤¿¤È¤¨¤Ð¡¢¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¡¦¥Ç¥Ð¥¤¥¹¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë»ØÄꤷ¤Þ¤¹¡£
-+.SS "¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ"
-+.PP
-+\fIjava\&.security package\fR¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë\fIKeyStore\fR¥¯¥é¥¹¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤ª¤è¤Ó¾ðÊó¤ÎÊѹ¹¤ò¹Ô¤¦¤¿¤á¤Î¡¢ÌÀ³Î¤ËÄêµÁ¤µ¤ì¤¿Â¿¤¯¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£Ê£¿ô¤Î°Û¤Ê¤ë¸ÇÄê¼ÂÁõ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¡¢³Æ¼ÂÁõ¤ÏÆÃÄê¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤òÂоݤȤ·¤Þ¤¹¡£
-+.PP
-+¸½ºß¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë2¤Ä¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë(\fIkeytool\fR¤È\fIjarsigner\fR)¡¢¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Ä¡¼¥ë¤È¤¤¤¦Ì¾Á°¤Î1¤Ä¤ÎGUI¥Ù¡¼¥¹¤Î¥Ä¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£\fIKeyStore\fR¥¯¥é¥¹¤Ï¸ø³«¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢JDK¥æ¡¼¥¶¡¼¤Ï¡¢¤½¤ì¤ò»ÈÍѤ¹¤ë¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.PP
-+Oracle¤¬Ä󶡤¹¤ëÁȹþ¤ß¤Î¥Ç¥Õ¥©¥ë¥È¤Î¼ÂÁõ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢KS¤È¤¤¤¦Ì¾Á°¤ÎÆȼ«¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(·Á¼°)¤ò»ÈÍѤ¹¤ë¤â¤Î¤Ç¡¢¥­¡¼¥¹¥È¥¢¤ò¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£Áȹþ¤ß¤Î¼ÂÁõ¤Ç¤Ï¡¢³ÆÈëÌ©¸°¤Ï¸ÄÊ̤Υѥ¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÀ°¹çÀ­¤Ï(ÈëÌ©¸°¤È¤ÏÊ̤Î)¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ï¥×¥í¥Ð¥¤¥À¥Ù¡¼¥¹¤Ç¡¢¤Ä¤Þ¤ê¡¢\fIKeyStore\fR¥¯¥é¥¹¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹(SPI)¤Ë´Ø¤·¤Æ¼ÂÁõ¤µ¤ì¤Þ¤¹¡£Âбþ¤¹¤ë\fIKeystoreSpi\fRÃê¾Ý¥¯¥é¥¹¤¬¤¢¤ê¡¢¤³¤ì¤â\fIjava\&.security package\fR¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¤¬¡¢¥×¥í¥Ð¥¤¥À¤¬¼ÂÁõ¤¹¤ëɬÍפΤ¢¤ë¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢¥×¥í¥Ð¥¤¥À¤È¤Ï¡¢Java Security API¤Ë¤è¤Ã¤Æ¥¢¥¯¥»¥¹²Äǽ¤Ê¥µ¡¼¥Ó¥¹¤Î¥µ¥Ö¥»¥Ã¥È¤ËÂФ·¡¢¤½¤Î¸ÇÄê¼ÂÁõ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î½¸¹ç¤Î¤³¤È¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¤Ë¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider\&.html¤Ë¤¢¤ë
-+Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¥×¥í¥Ð¥¤¥À¤Î¼ÂÁõÊýË¡¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¥×¥í¥Ð¥¤¥À¤ò¼ÂÁõ¤·¡¢\fIKeystoreSpi\fR¥µ¥Ö¥¯¥é¥¹¤Î¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.PP
-+¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢\fIKeyStore\fR¥¯¥é¥¹¤Î\fIgetInstance\fR¥Õ¥¡¥¯¥È¥ê¡¦¥á¥½¥Ã¥É¤ò»ÈÍѤ·¤Æ¡¢ÍÍ¡¹¤Ê¥×¥í¥Ð¥¤¥À¤«¤é°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Ï¡¢¥­¡¼¥¹¥È¥¢¾ðÊó¤Î³ÊǼ·Á¼°¤È¥Ç¡¼¥¿·Á¼°¤òÄêµÁ¤¹¤ë¤È¤È¤â¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÈëÌ©¸°¤È¥­¡¼¥¹¥È¥¢¼«ÂΤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤·¤Þ¤¹¡£°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ë¤Ï¡¢¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-+.PP
-+\fIkeytool\fR¥³¥Þ¥ó¥É¤Ï¡¢Ç¤°Õ¤Î¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢¼ÂÁõ¤ÇÆ°ºî¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÅϤµ¤ì¤¿¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ°·¤¤¡¢¤³¤ì¤ò\fIFileInputStream\fR¤ËÊÑ´¹¤·¤Æ¡¢¤½¤³¤«¤é¥­¡¼¥¹¥È¥¢¤Î¾ðÊó¤ò¥í¡¼¥É¤·¤Þ¤¹¡£\fIjarsigner\fR¥Ä¡¼¥ë¤ª¤è¤Ó\fIpolicytool\fR¥Ä¡¼¥ë¤Ï¡¢URL¤ò»ÈÍѤ·¤Æ»ØÄê²Äǽ¤ÊǤ°Õ¤Î¾ì½ê¤«¤é¥­¡¼¥¹¥È¥¢¤òÆɤ߼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ª¤è¤Ó\fIkeytool\fR¥³¥Þ¥ó¥É¤Î¾ì¹ç¡¢\fI\-storetype\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Ý¥ê¥·¡¼¡¦¥Ä¡¼¥ë¤Î¾ì¹ç¡¢¡ÖÊÔ½¸¡×¥á¥Ë¥å¡¼¤ÎChange Keystore¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-+.PP
-+¥æ¡¼¥¶¡¼¤¬¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿\fIkeystore\&.type\fR¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ˴ð¤Å¤¤¤Æ¡¢¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ï\fIjava\&.security\fR¤È¸Æ¤Ð¤ì¡¢JDK¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\fIjava\&.home/lib/security\fRÆâ¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢java\&.home¤Ï¼Â¹Ô»þ´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£\fIjre\fR¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢JDK¤Þ¤¿¤ÏJava Runtime Environment (JRE)¤ÎºÇ¾å°Ì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£
-+.PP
-+³Æ¥Ä¡¼¥ë¤Ï¡¢\fIkeystore\&.type\fR¤ÎÃͤò¼èÆÀ¤·¡¢¤½¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥Ð¥¤¥À¤òÄ´¤Ù¤Þ¤¹¡£ÌÜŪ¤Î¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥×¥í¥Ð¥¤¥À¤«¤é¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.PP
-+\fIKeyStore\fR¥¯¥é¥¹¤Ç¤Ï¡¢\fIgetDefaultType\fR¤È¤¤¤¦Ì¾Á°¤Îstatic¥á¥½¥Ã¥É¤òÄêµÁ¤·¡¢¤³¤ì¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ª¤è¤Ó¥¢¥×¥ì¥Ã¥È¤«¤é\fIkeystore\&.type property\fR¤ÎÃͤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥³¡¼¥É¤Î¹Ô¤Ç¤Ï¡¢\fIkeystore\&.type property\fR¤Ç»ØÄꤵ¤ì¤¿¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òºîÀ®¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+KeyStore keyStore = KeyStore\&.getInstance(KeyStore\&.getDefaultType());
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢\fIjks\fR
-+(Oracle¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+keystore\&.type=jks
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\fIJKS\fR¤Ï\fIjks\fR¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¤½¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\fIpkcs12\fR¤È¸Æ¤Ð¤ì¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¾ì¹ç¡¢¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+keystore\&.type=pkcs12
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fBÃí°Õ: \fRPKCS 11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/p11guide\&.html¤Ë¤¢¤ë
-+Java PKCS #11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖKeyTool¡×¤ª¤è¤Ó¡ÖJarSigner¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.SS "¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à"
-+.PP
-+¥Ç¥Õ¥©¥ë¥È¤Ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¼¡¤Î¤¤¤º¤ì¤«¤Î¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA1¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à(DSA)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA256¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤¿RSA¥¢¥ë¥´¥ê¥º¥à¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA256¤ÈÂʱ߶ÊÀþ¥Ç¥¸¥¿¥ë½ð̾¥¢¥ë¥´¥ê¥º¥à(ECDSA)¤ò»ÈÍѤ·¤¿Âʱ߶ÊÀþ(EC)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
-+.RE
-+.PP
-+½ð̾¼Ô¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤¬DSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA¤ÈDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬RSA¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA256¤ÈRSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤è¤¦¤È¤·¤Þ¤¹¡£½ð̾¼Ô¤Î¸°¤¬EC¸°¤Ç¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¤ÏSHA256¤ÈECDSA¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤·¤Þ¤¹¡£
-+.PP
-+¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\fI\-sigalg\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£
-+.SS "½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¡¢½ÐÎϤµ¤ì¤ë½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÏÆþÎÏJAR¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¤¬¡¢¼¡¤Î2¤Ä¤ÎÄɲåե¡¥¤¥ë¤¬META\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\&.SF\fR³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Õ¥¡¥¤¥ë
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\&.DSA\fR¡¢\fI\&.RSA\fR¤Þ¤¿¤Ï\fI\&.EC\fR³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
-+.RE
-+.PP
-+¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fI\-sigFile\fR¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥ª¥×¥·¥ç¥ó¤¬\fI\-sigFile MKSIGN\fR¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë¤Ï\fIMKSIGN\&.SF\fR¤ª¤è¤Ó\fIMKSIGN\&.DSA\fR¤È¤¤¤¦Ì¾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sigfile\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ç»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤ÎºîÀ®»þ¤Ë¡¢³ºÅö¤¹¤ëʸ»ú¤¬²¼Àþ(_)ʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Í­¸ú¤Êʸ»ú¤Ï¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤Ç¤¹¡£
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB½ð̾¥Õ¥¡¥¤¥ë\fR
-+.RS 4
-+.PP
-+½ð̾¥Õ¥¡¥¤¥ë(\fI\&.SF\fR¥Õ¥¡¥¤¥ë)¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ëºÝ¤ËJAR¥Õ¥¡¥¤¥ë¤Ë¾ï¤Ë´Þ¤Þ¤ì¤ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤È»÷¤Æ¤¤¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤è¤¦¤Ê¡¢¼¡¤Ë¼¨¤¹3¤Ä¤Î¹Ô¤¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥Õ¥¡¥¤¥ë̾
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à(SHA)¤Î̾Á°
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+SHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
-+.RE
-+.PP
-+¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎSHA¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¡¦¥Ç¡¼¥¿¤Î¥À¥¤¥¸¥§¥¹¥È(¥Ï¥Ã¥·¥å)¤Ë¤Ê¤ê¤Þ¤¹¡£\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÎÃͤϡ¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¤½¤Î3¹Ô¤Î¥Ï¥Ã¥·¥å¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.PP
-+½ð̾¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¤È¡¢¸¡¾Ú¤ÎºÇŬ²½¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë\fR
-+.RS 4
-+.PP
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï½ð̾¤¬ÉÕ¤±¤é¤ì¡¢½ð̾¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢½ð̾¤Ë»ÈÍѤµ¤ì¤¿ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤òǧ¾Ú¤¹¤ë¥­¡¼¥¹¥È¥¢¤«¤é¤Î¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤â¡¢ÆâÉô¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ï¡¢»ÈÍѤµ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Ë±þ¤¸¤Æ¡¢\fI\&.DSA\fR¡¢\fI\&.RSA\fR¤Þ¤¿¤Ï\fI\&.EC\fR¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.RE
-+.SS "½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×"
-+.PP
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë½ð̾¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤ª¤è¤ÓÊݸ¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢\fIjarsigner\fR¤ÏÂåÂؽð̾µ¡¹½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤Ï¾Êά²Äǽ¤Ç¡¢½ð̾»þ¤Ë¼¡¤Î³Æ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-tsa \fIurl\fR
-+\-tsacert \fIalias\fR
-+\-altsigner \fIclass\fR
-+\-altsignerpath \fIclasspathlist\fR
-+\-tsapolicyid \fIpolicyid\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú"
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¹ß¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 1.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 1." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(\fI\&.DSA\fR)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤¿½ð̾¤¬¡¢¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë¼¨¤µ¤ì¤ë¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤³¤È¤ò³Îǧ¤·¤Þ¤¹¡£¤Þ¤¿¡¢½ð̾¤¬Âбþ¤¹¤ë½ð̾(\fI\&.SF\fR)¥Õ¥¡¥¤¥ë¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¡¢¤½¤ì¤Ë¤è¤ê¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤¬²þ¤¶¤ó¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 2.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 2." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Ë¼¨¤µ¤ì¤ë¥À¥¤¥¸¥§¥¹¥È¤ò¡¢¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
-+.sp
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£
-+.sp
-+°ìÃפ·¤Ê¤¤¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¡¢¤¢¤Þ¤êºÇŬ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£½ð̾¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤¬¡¢¸½ºß¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ë°ìÃפ·¤Ê¤¤Íýͳ¤Î1¤Ä¤Ï¡¢½ð̾¤ª¤è¤Ó\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¸å¤Ë¡¢(\fIjar\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ë¤ËÄɲ䵤줿¤³¤È¤Ç¤¹¡£\fIjar\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤ë¤³¤È¤Ë¤è¤ê¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹¤¬¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¸¡¾Ú¤¬¤Þ¤ÀÀ®¸ù¤·¤Æ¤¤¤ë¤È¤ß¤Ê¤µ¤ì¤ë¤Î¤Ï¡¢½ð̾¤ÎÀ¸À®°Ê¹ß¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£¤³¤ì¤¬È¯À¸¤¹¤ë¤Î¤Ï¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¾ì¹ç¤Ç¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 3.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 3." 4.2
-+.\}
-+\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤ÄJAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߼è¤ê¤Þ¤¹¡£Æɼè¤êÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¥×¥í¥»¥¹Ãæ¤Ë¤Ê¤ó¤é¤«¤Î½ÅÂç¤Ê¸¡¾Ú¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¤½¤Î¥×¥í¥»¥¹¤ÏÄä»ß¤µ¤ì¡¢¥»¥­¥å¥ê¥Æ¥£Îã³°¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢Îã³°¤òÊ᪤ª¤è¤Óɽ¼¨¤·¤Þ¤¹¡£
-+.RE
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
- .br
--.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¡¢¼ÂºÝ¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢½ð̾(¤Ä¤Þ¤ê.SF¥Õ¥¡¥¤¥ë)¤ÎÀ¸À®¸å¤Ë¡¢JAR¥Õ¥¡¥¤¥ë¤Ë1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬(\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)Äɲ䵤줿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹(¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤¹)¤¬¡¢.SF¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Ë³ÊǼ¤µ¤ì¤¿¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®»þ¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¸ºß¤·¤Æ¤¤¤¿¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ë¤Ê¤ê¡¢¸¡¾Ú¤ÏÀ®¸ù¤·¤¿¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.TP 3
--3.
--JAR¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤Ä³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£Æɹþ¤ßÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î³ºÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£2¤Ä¤Î¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¸¡¾Ú¥×¥í¥»¥¹¤ÎÅÓÃæ¤Ç¤Ê¤ó¤é¤«¤Î½ÅÂç¤Ê¸¡¾Ú¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¸¡¾Ú¥×¥í¥»¥¹¤ÏÃæ»ß¤µ¤ì¡¢¥»¥­¥å¥ê¥Æ¥£Îã³°¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£Îã³°¤Ï¡¢\f3jarsigner\fP¤¬¥­¥ã¥Ã¥Á¤·¤Æɽ¼¨¤·¤Þ¤¹¡£
--.LP
--.SS
--1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤òÂоݤȤ¹¤ëÊ£¿ô¤Î½ð̾
--.LP
--.LP
--1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ\f3jarsigner\fP¥Ä¡¼¥ë¤òÊ£¿ô²ó¼Â¹Ô¤·¡¢¼Â¹Ô¤Î¤¿¤Ó¤Ë¡¢°Û¤Ê¤ë¥æ¡¼¥¶¡¼¤ÎÊÌ̾¤ò»ØÄꤹ¤ì¤Ð¡¢JAR¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î¥æ¡¼¥¶¡¼¤Î½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner myBundle.jar susan
--.fl
-- jarsigner myBundle.jar kevin
--.fl
--\fP
--.fi
--
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤¬Ê£¿ô²ó½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ú¥¢¤¬Ê£¿ô´Þ¤Þ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ú¥¢¤Ï¡¢1²ó¤Î½ð̾¤ËÂФ·¤Æ1¤ÄºîÀ®¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¾å¤ÎÎã¤Ç½ÐÎϤµ¤ì¤ëJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î̾Á°¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- SUSAN.SF
--.fl
-- SUSAN.DSA
--.fl
-- KEVIN.SF
--.fl
-- KEVIN.DSA
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Ãí°Õ: JAR¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢JDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤ÇÀ¸À®¤µ¤ì¤¿½ð̾¤È\f3jarsigner\fP¤ÇÀ¸À®¤µ¤ì¤¿½ð̾¤¬º®ºß¤Ç¤­¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤¹¤Ç¤Ë\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë¡¢\f3jarsigner\fP¤ò»ÈÍѤ·¤Æ½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.LP
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+Äɲäηٹð(¤Þ¤¿¤Ï¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¥¨¥é¡¼)¤Ï¤¹¤Ù¤ÆÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£Æ±Íͤˡ¢¾ÚÌÀ¤¬¿®Íê¤Ç¤­¤ë¤«¤ò·èÄꤹ¤ë¤¿¤á¤Ë¡¢(\fI\-verbose\fR¤ª¤è¤Ó\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ)¾ÚÌÀ½ñ¤ÎÆâÍƤâÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.SS "1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤òÂоݤȤ¹¤ëÊ£¿ô¤Î½ð̾"
-+.PP
-+¼¡¤Î¤è¤¦¤Ë¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò¥Õ¥¡¥¤¥ë¤ÇÊ£¿ô²ó¼Â¹Ô¤·¡¢¼Â¹Ô¤Î¤¿¤Ó¤Ë°Û¤Ê¤ë¥æ¡¼¥¶¡¼¤ÎÊÌ̾¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢1¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î¥æ¡¼¥¶¡¼¤Î½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner myBundle\&.jar susan
-+jarsigner myBundle\&.jar kevin
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤¬Ê£¿ô²ó½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢Ê£¿ô¤Î\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢1²ó¤Î½ð̾¤ËÂФ·¤Æ1¤Ä¤Î¥Ú¥¢¤È¤Ê¤ê¤Þ¤¹¡£Á°½Ò¤ÎÎã¤Ç¤Ï¡¢½ÐÎÏJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î̾Á°¤Î¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+SUSAN\&.SF
-+SUSAN\&.DSA
-+KEVIN\&.SF
-+KEVIN\&.DSA
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+\fBÃí°Õ: \fRJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JDK 1\&.1¤Î\fIjavakey\fR¥³¥Þ¥ó¥É¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤È¡¢\fIjarsigner\fR¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç¤¹¤Ç¤Ë½ð̾¤µ¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
- .SH "¥ª¥×¥·¥ç¥ó"
--.LP
--.LP
--¼¡¤Ë¡¢\f3jarsigner\fP¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£Ãí°Õ:
--.LP
--.RS 3
--.TP 2
--o
--¤É¤Î¥ª¥×¥·¥ç¥ó̾¤Ë¤âÀèƬ¤Ë¥Þ¥¤¥Ê¥¹µ­¹æ(\-)¤¬ÉÕ¤­¤Þ¤¹¡£
--.TP 2
--o
--¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤμºݤÎÃÍ(¥ª¥×¥·¥ç¥ó¤ÎÃÍ)¤Ï¡¢»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 2
--o
--\f2\-keystore\fP¡¢\f2\-storepass\fP¡¢\f2\-keypass\fP¡¢\f2\-sigfile\fP¡¢\f2\-sigalg\fP¡¢\f2\-digestalg\fP¤ª¤è¤Ó\f2\-signedjar\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤǤ­¤ë¤Î¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¾ì¹ç¤Ç¤Ï¤Ê¤¯¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£Æ±Íͤˡ¢ÊÌ̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£
--.RE
--
--.LP
--.RS 3
--.TP 3
--\-keystore url
--¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\f2.keystore\fP¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢user.home¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£
--.br
--.br
--½ð̾¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤¬É¬ÍפǤ¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç(¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç)¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.br
--.br
--¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤Ï\f2ɬÍפ¢¤ê¤Þ¤»¤ó\fP¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
--.br
--.br
--Ãí°Õ: \f2\-keystore\fP¤Î°ú¿ô¤Ë¤Ï¡¢URL¤Î¤«¤ï¤ê¤Ë¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¡Öfile:¡×URL¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.PP
-+¼¡¤Î³Æ¹à¤Ç¤Ï¡¢ÍÍ¡¹¤Ê\fIjarsigner\fR¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£¼¡¤Îɸ½à¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¤É¤Î¥ª¥×¥·¥ç¥ó̾¤Ë¤âÀèƬ¤Ë¥Þ¥¤¥Ê¥¹µ­¹æ(\-)¤¬ÉÕ¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤμºݤÎÃÍ(¥ª¥×¥·¥ç¥ó¤ÎÃÍ)¤Ï¡¢»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fI\-keystore\fR¡¢\fI\-storepass\fR¡¢\fI\-keypass\fR¡¢\fI\-sigfile\fR¡¢\fI\-sigalg\fR¡¢\fI\-digestalg\fR¤ª¤è¤Ó\fI\-signedjar\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤǤ­¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú»þ¤Ë¤Ï¡¢¤³¤ì¤é¤Ï´Ø·¸¤¢¤ê¤Þ¤»¤ó¡£Æ±Íͤˡ¢ÊÌ̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Ø¤Î½ð̾»þ¤Î¤ß¤Ç¤¹¡£
-+.RE
-+.PP
-+\-keystore \fIurl\fR
-+.RS 4
-+¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢\fIuser\&.home\fR¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç·èÄꤵ¤ì¤¿¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\fI\&.keystore\fR¤Ë¥Ç¥Õ¥©¥ë¥ÈÀßÄꤵ¤ì¤Þ¤¹¡£
-+.sp
-+¥­¡¼¥¹¥È¥¢¤Ï½ð̾»þ¤Ë¤ÏɬÍפǤ¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.sp
-+¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-keystore\fR°ú¿ô¤Ë¤Ï¡¢URL¤Ç¤Ï¤Ê¤¯¥Õ¥¡¥¤¥ë̾¤È¥Ñ¥¹¤ò»ØÄê¤Ç¤­¡¢¤³¤Î¾ì¹ç¡¢¥Õ¥¡¥¤¥ë: URL¤ÈƱ¤¸¤è¤¦¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Ë¤è¤¦¤Ë»ØÄꤹ¤ë¤ÈƱÅù¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
-- \-keystore \fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--¤³¤ì¤Ï¡¢¼¡¤Î»ØÄê¤ÈƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- \-keystore file:\fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--JRE¤Î\f2$JAVA_HOME/lib/security\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤¿\f2java.security\fP¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS#11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢keytool¤Èjarsigner¤ÏPKCS#11¥È¡¼¥¯¥ó¤Ë´ð¤Å¤¤¤ÆÆ°ºî¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2\-keystore NONE\fP
--.TP 2
--o
--\f2\-storetype PKCS11\fP
--.RE
--¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢¹½À®¤µ¤ì¤¿PKCS#11¥È¡¼¥¯¥ó¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- jarsigner \-keystore NONE \-storetype PKCS11 \-list
--.fl
--\fP
--.fi
--.TP 3
--\-storetype storetype
--¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Îkeystore.type¥×¥í¥Ñ¥Æ¥£¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Ç¤¹¡£¤³¤ÎÃͤϡ¢\f2java.security.KeyStore\fP¤Îstatic \f2getDefaultType\fP¥á¥½¥Ã¥É¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆPCKS#11¥È¡¼¥¯¥ó¤ÎPIN¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£²¿¤â»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢keytool¤Èjarsigner¤Ï¥æ¡¼¥¶¡¼¤Ë¥È¡¼¥¯¥óPIN¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£¥È¡¼¥¯¥ó¤ËÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹(ÀìÍѤÎPIN¥Ñ¥Ã¥É¤äÀ¸ÂÎÆɼè¤êµ¡¤Ê¤É)¤¬¤¢¤ë¾ì¹ç¡¢\f2\-protected\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¡¦¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
--.TP 3
--\-storepass[:env | :file] argument
--¥­¡¼¥¹¥È¥¢¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤ËɬÍפʥѥ¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤¬É¬ÍפʤΤϡ¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Î¤ß¤Ç¤¹(¸¡¾Ú¤¹¤ë¤È¤­¤Ë¤ÏÉÔÍפǤ¹)¡£¤½¤Î¾ì¹ç¡¢\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.br
--.br
--½¤¾þ»Ò\f2env\fP¤Þ¤¿¤Ï\f2file\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\f2argument\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2env\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.TP 2
--o
--\f2file\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.RE
--Ãí°Õ: ¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
--.TP 3
--\-keypass[:env | :file] argument
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ËÂбþ¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤òÊݸ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£\f3jarsigner\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤¬»ØÄꤵ¤ì¤Æ¤ª¤é¤º¡¢É¬Íפʥѥ¹¥ï¡¼¥É¤¬¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
--.br
--.br
--½¤¾þ»Ò\f2env\fP¤Þ¤¿¤Ï\f2file\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\f2argument\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--\f2env\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.TP 2
--o
--\f2file\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
--.RE
--Ãí°Õ: ¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
--.TP 3
--\-sigfile file
--.SF¥Õ¥¡¥¤¥ë¤È .DSA¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2file\fP¤ËDUKESIGN¤ò»ØÄꤹ¤ë¤È¡¢À¸À®¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢¤½¤ì¤¾¤ìDUKESIGN.SF¤ÈDUKESIGN.DSA¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ÎMETA\-INF¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£
--.br
--.br
--\f2file\fP¤Ë»ÈÍѤǤ­¤ëʸ»ú¤Ï¡Öa\-zA\-Z0\-9_\-¡×¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢Ê¸»ú¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥ó¤Î¤ß¤ò»ÈÍѤǤ­¤Þ¤¹¡£Ãí°Õ: .SF¤ª¤è¤Ó.DSA¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-sigfile\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤ÎÃæ¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ë»ÈÍѤǤ­¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëʸ»ú¤ò²¼Àþ(_)¤ËÃÖ¤­´¹¤¨¤Æ¥Õ¥¡¥¤¥ë̾¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-sigalg algorithm
-+\-keystore \fIfilePathAndName\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-keystore file:\fIfilePathAndName\fR
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+(JRE¤Î\fI$JAVA_HOME/lib/security directory\fR¤Ë¤¢¤ë)
-+\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS #11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤¿¾ì¹ç¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤ÏPKCS#11¥È¡¼¥¯¥ó¤Ë´ð¤Å¤¤¤ÆÆ°ºî¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+\-keystore NONE
-+\-storetype PKCS11
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢¹½À®¤µ¤ì¤¿PKCS#11¥È¡¼¥¯¥ó¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \-list
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-storetype \fIstoretype\fR
-+.RS 4
-+¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î\fIkeystore\&.type\fR¥×¥í¥Ñ¥Æ¥£¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Ç¡¢¤³¤ÎÃͤϡ¢\fIjava\&.security\&.KeyStore\fR¤Îstatic
-+\fIgetDefaultType\fR¥á¥½¥Ã¥É¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-storepass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢PCKS #11¥È¡¼¥¯¥ó¤ÎPIN¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£²¿¤â»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢¥È¡¼¥¯¥óPIN¤Î»ØÄê¤òµá¤á¤é¤ì¤Þ¤¹¡£¥È¡¼¥¯¥ó¤ËÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹(ÀìÍѤÎPIN¥Ñ¥Ã¥É¤äÀ¸ÂÎÆɼè¤êµ¡¤Ê¤É)¤¬¤¢¤ë¾ì¹ç¡¢\fI\-protected\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¡¦¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
-+.RE
-+.PP
-+\-storepass[:env | :file} \fIargument\fR
-+.RS 4
-+¥­¡¼¥¹¥È¥¢¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤ËɬÍפʥѥ¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤¬É¬ÍפʤΤϡ¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Î¤ß¤Ç¤¹(¸¡¾Ú¤¹¤ë¤È¤­¤Ë¤ÏÉÔÍפǤ¹)¡£¤½¤Î¾ì¹ç¡¢\fI\-storepass\fR¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤¤¤È¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.sp
-+½¤¾þ»Ò\fIenv\fR¤Þ¤¿¤Ï\fIfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\fIargument\fR¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIenv\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIfile\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+\fBÃí°Õ:\fR¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-keypass [:env | :file] \fIargument\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ËÂбþ¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤òÊݸ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£\fIjarsigner\fR¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤¬»ØÄꤵ¤ì¤Æ¤ª¤é¤º¡¢É¬Íפʥѥ¹¥ï¡¼¥É¤¬¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
-+.sp
-+½¤¾þ»Ò\fIenv\fR¤Þ¤¿¤Ï\fIfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\fIargument\fR¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIenv\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIfile\fR:
-+\fIargument\fR¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.RE
-+.sp
-+\fBÃí°Õ: \fR¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¤Þ¤¿¤Ï¥»¥­¥å¥ê¥Æ¥£Êݸ¤ì¤¿¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-sigfile \fIfile\fR
-+.RS 4
-+À¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë»ÈÍѤ¹¤ë¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Õ¥¡¥¤¥ë¤¬\fIDUKESIGN\fR¤Î¾ì¹ç¡¢À¸À®¤µ¤ì¤ë\fI\&.SF\fR¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ï¡¢\fIDUKESIGN\&.SF\fR¤ª¤è¤Ó\fIDUKESIGN\&.DSA\fR¤È¤¤¤¦Ì¾Á°¤Ç¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î\fIMETA\-INF\fR¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+¥Õ¥¡¥¤¥ëÆâ¤Îʸ»ú¤Ï¡¢¥»¥Ã¥È\fIa\-zA\-Z0\-9_\-\fR¤«¤é»ØÄꤵ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¡¢²¼Àþ¤ª¤è¤Ó¥Ï¥¤¥Õ¥óʸ»ú¤Î¤ß¤ò»ÈÍѤǤ­¤Þ¤¹¡£\fI\&.SF\fR¤ª¤è¤Ó\fI\&.DSA\fR¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¾®Ê¸»ú¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-+.sp
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sigfile\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤È\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÌ̾¤ÎÀèƬ¤Î8ʸ»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊÑ´¹¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ÊÌ̾¤¬8ʸ»ṳ́Ëþ¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤¬¤½¤Î¤Þ¤Þ»ÈÍѤµ¤ì¤Þ¤¹¡£ÊÌ̾¤Ë¡¢½ð̾¥Õ¥¡¥¤¥ë̾¤Ç̵¸ú¤Êʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Õ¥¡¥¤¥ë̾¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¡¢³ºÅö¤¹¤ëʸ»ú¤¬²¼Àþ(_)ʸ»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-sigalg \fIalgorithm\fR
-+.RS 4
- JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--ɸ½à½ð̾¥¢¥ë¥´¥ê¥º¥à̾¤Î°ìÍ÷¤Ï¡¢Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î
--.na
--\f2ÉÕÏ¿A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤È¤Î¸ß´¹À­¤¬É¬ÍפǤ¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ÈëÌ©¸°¤Î¥¿¥¤¥×¤Ë±þ¤¸¤ÆSHA1withDSA¡¢SHA256withRSA¡¢SHA256withECDSA¤Î¤¤¤º¤ì¤«¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\f2\-providerClass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.TP 3
--\-digestalg algorithm
-+.sp
-+ɸ½àŪ¤Ê½ð̾¥¢¥ë¥´¥ê¥º¥à̾¤Î¥ê¥¹¥È¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA¤Ë¤¢¤ë
-+Java Cryptography Architecture (JCA)¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖÉÕÏ¿A: ɸ½à̾¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ëÈëÌ©¸°¤È¤Î¸ß´¹À­¤¬É¬ÍפǤ¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢ÈëÌ©¸°¤Î¥¿¥¤¥×¤Ë±þ¤¸¤Æ¡¢\fISHA1withDSA\fR¡¢\fISHA256withRSA\fR¤Þ¤¿¤Ï\fISHA256withECDSA\fR¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\fI\-providerClass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-digestalg \fIalgorithm\fR
-+.RS 4
- JAR¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê¤ò¥À¥¤¥¸¥§¥¹¥È¤¹¤ëºÝ¤Ë»ÈÍѤ¹¤ë¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à̾¤Î°ìÍ÷¤Ï¡¢Java°Å¹æ²½¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î
--.na
--\f2ÉÕÏ¿A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢SHA256¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\f2\-providerClass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤¬¼ºÇÔ¤·¤Þ¤¹¡£
--.TP 3
--\-signedjar file
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
--.br
--.br
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç̾Á°¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë(½ð̾¤ÎÂоݤȤʤëJAR¥Õ¥¡¥¤¥ë)¤Î̾Á°¤ÈƱ¤¸Ì¾Á°¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-verify
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢»ØÄꤵ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ç¤Ï¤Ê¤¯¸¡¾Ú¤¬¹Ô¤ï¤ì¤Þ¤¹¡£¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢¡Öjar¤¬¸¡¾Ú¤µ¤ì¤Þ¤·¤¿¡£¡×¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤JAR¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥¢¥ë¥´¥ê¥º¥à(RSA¥×¥í¥Ð¥¤¥À¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò½ªÎ»¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤ÎRSA¤Ê¤É)¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤è¤¦¤È¤¹¤ë¤È¡¢¡Öjar¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£(½ð̾¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¹½Ê¸²òÀϤǤ­¤Þ¤»¤ó)¡×¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ï¡¢\f3jarsigner\fP¤Þ¤¿¤ÏJDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤Î¤É¤Á¤é¤«¤Þ¤¿¤ÏξÊý¤ò»ÈÍѤ·¤Æ¸¡¾Ú¤Ç¤­¤Þ¤¹¡£
--.br
--.br
--¸¡¾Ú¤Î¾ÜºÙ¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-certs
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\f2\-verify\fP¤ª¤è¤Ó\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¼¡¤Î¤â¤Î¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--½ð̾¼Ô¤Î¸ø³«¸°¤ò¾ÚÌÀ¤¹¤ë(.DSA¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤¿)¾ÚÌÀ½ñ¥¿¥¤¥×¤Î̾Á°
--.TP 2
--o
--¾ÚÌÀ½ñ¤¬X.509¾ÚÌÀ½ñ(¤Ä¤Þ¤ê¡¢\f2java.security.cert.X509Certificate\fP¤Î¥¤¥ó¥¹¥¿¥ó¥¹)¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢½ð̾¼Ô¤Î¼±ÊÌ̾
--.RE
--¥­¡¼¥¹¥È¥¢¤Î³Îǧ¤â¹Ô¤ï¤ì¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤ÎÃͤ¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ì¤Ð¡¢¸¡ºº¤µ¤ì¤Þ¤¹¡£½ð̾¼Ô¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢Æâ¤Î¥¨¥ó¥È¥ê¤È°ìÃפ·¤¿¾ì¹ç¤Ï¡¢¼¡¤Î¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£
--.RS 3
--.TP 2
--o
--½ð̾¼Ô¤Ë³ºÅö¤¹¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¡£¤³¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËͳÍ褹¤ë½ð̾¼Ô¤Î¾ì¹ç¤Ï¡¢³ç¸Ì¤Ç¤Ï¤Ê¤¯Âç³ç¸Ì¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£
--.RE
--.TP 3
--\-certchain file
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿ÊÌ̾¤Ç·è¤Þ¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬´°Á´¤Ç¤Ê¤¤¾ì¹ç¤Ë¡¢»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¾õÂ֤ˤʤë²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ï¡¢¥­¡¼¥¹¥È¥¢¤¬¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¾å¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¤¬¡¢¤½¤³¤Ë¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÎÁ´ÂΤòÊÝ»ý¤Ç¤­¤ëÎΰ褬¸ºß¤·¤Æ¤¤¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ç¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï°ìÏ¢¤ÎX.509¾ÚÌÀ½ñ¤¬½ç¤ËÏ¢·ë¤µ¤ì¤¿¤â¤Î¡¢PKCS#7·Á¼°¤Îñ°ì¥Ç¡¼¥¿¡¦¥Ö¥í¥Ã¥¯¤Î¤¤¤º¤ì¤«¤È¤Ê¤ê¡¢¤½¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¤Ï¥Ð¥¤¥Ê¥ê¡¦¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¡¢Internet RFC 1421ɸ½à¤Çµ¬Äꤵ¤ì¤ë°õºþ²Äǽ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°(BASE64¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤â¸Æ¤Ð¤ì¤ë)¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
--.TP 3
--\-verbose
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f3jarsigner\fP¤Ï¡Ö¾éĹ¡×¥â¡¼¥É¤ÇÆ°ºî¤·¡¢JAR¤Î½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¿Ê¹Ô¾õ¶·¤Ë´Ø¤¹¤ëÄɲþðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
--.TP 3
--\-internalsf
--°ÊÁ°¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤¿.DSA(½ð̾¥Ö¥í¥Ã¥¯)¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¡¢À¸À®¤µ¤ì¤¿.SF¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Î´°Á´¤Ê¥³¥Ô¡¼¤¬Éä¹æ²½¤µ¤ì¤¿·Á¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ÎÆ°ºî¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£¸½ºß¤Ç¤Ï¡¢½ÐÎÏJAR¥Õ¥¡¥¤¥ëÁ´ÂΤΥµ¥¤¥º¤ò¾®¤µ¤¯¤¹¤ë¤¿¤á¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï.SF¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤¬.DSA¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¿¤À¤·¡¢\f2\-internalsf\fP¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ë¤È¡¢°ÊÁ°¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤Ë¤ÏÊØÍø¤Ç¤¹¤¬¡¢¤½¤ì°Ê³°¤Ë¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Í­±×¤ÊºÇŬ²½¤¬¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\fP
--.TP 3
--\-sectionsonly
--¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤ò´Þ¤à¥Ø¥Ã¥À¡¼¤Ï\f2´Þ¤Þ¤ì¤Þ¤»¤ó\fP¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë´Ø¤¹¤ë¾ðÊ󤪤è¤Ó¥Ï¥Ã¥·¥å¤Î¤ß¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ºÇŬ²½¤Î¤¿¤á¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤¬Äɲ䵤ì¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú»þ¤Ë¡¢¤Þ¤º¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤È¼ÂºÝ¤Ë°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤Æ¸¡¾Ú¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--¾ÜºÙ¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤Ë¤ÏÊØÍø¤Ç¤¹¤¬¡¢¤½¤ì°Ê³°¤Ë¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Í­±×¤ÊºÇŬ²½¤¬¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\fP
--.TP 3
--\-protected
--\f2true\fP¤Þ¤¿¤Ï\f2false\fP¤Î¤¤¤º¤ì¤«¡£ÀìÍÑPIN¥ê¡¼¥À¡¼¤Ê¤É¤ÎÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹¤ò²ð¤·¤Æ¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÃͤË\f2true\fP¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-providerClass provider\-class\-name
--¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤¬¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë(\f2java.security\fP)¤Î¥ê¥¹¥È¤ËÆþ¤Ã¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¡¢°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤Î¥Þ¥¹¥¿¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£
--.br
--.br
--\f2\-providerArg\fP \f2ConfigFilePath\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£keytool¤Èjarsigner¤Ï¥×¥í¥Ð¥¤¥À¤òưŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹(¤³¤³¤Ç¡¢\f2ConfigFilePath\fP¤Ï¥È¡¼¥¯¥ó¹½À®¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ç¤¹)¡£¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇSun PKCS#11¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ËPKCS#11¥­¡¼¥¹¥È¥¢¤ò°ìÍ÷ɽ¼¨¤¹¤ë¥³¥Þ¥ó¥É¤ÎÎã¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerClass sun.security.pkcs11.SunPKCS11 \\
--.fl
-- \-providerArg /foo/bar/token.config \\
--.fl
-+.sp
-+ɸ½àŪ¤Ê¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à̾¤Î¥ê¥¹¥È¤Ï¡¢http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA¤Ë¤¢¤ë
-+Java Cryptography Architecture (JCA)¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Î¡ÖÉÕÏ¿A: ɸ½à̾¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\fISHA256\fR¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¤¬ÀÅŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢\fI\-providerClass\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¤è¤¦¤Ê¥×¥í¥Ð¥¤¥À¤ò¥æ¡¼¥¶¡¼¤¬»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-certs
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò\fI\-verify\fR¤ª¤è¤Ó\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¡¢½ð̾¼Ô¤Î¸ø³«¸°¤ò¾ÚÌÀ¤¹¤ë¾ÚÌÀ½ñ(\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ)¤Î¥¿¥¤¥×¤Î̾Á°¤¬´Þ¤Þ¤ì¡¢¾ÚÌÀ½ñ¤¬X\&.509¾ÚÌÀ½ñ(\fIjava\&.security\&.cert\&.X509Certificate\fR¤Î¥¤¥ó¥¹¥¿¥ó¥¹)¤Î¾ì¹ç¡¢½ð̾¼Ô¤Î¼±ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-+.sp
-+¥­¡¼¥¹¥È¥¢¤Î³Îǧ¤â¹Ô¤ï¤ì¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤ÎÃͤ¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë(¤¢¤ë¾ì¹ç)¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤¹¡£½ð̾¼Ô¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢Æâ¤Î¥¨¥ó¥È¥ê¤È°ìÃפ¹¤ë¾ì¹ç¡¢¤½¤Î½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢¤Î¥¨¥ó¥È¥ê¤ÎÊÌ̾¤¬´Ý¥«¥Ã¥³Æâ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1\&.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËͳÍ褹¤ë½ð̾¼Ô¤Î¾ì¹ç¡¢ÊÌ̾¤Ï´Ý¥«¥Ã¥³¤Ç¤Ï¤Ê¤¯Â祫¥Ã¥³Æâ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-certchain \fIfile\fR
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿ÊÌ̾¤Ë¤è¤Ã¤Æɽ¤µ¤ì¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬´°Á´¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ë¡¢»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥óÁ´ÂΤòÊÝ»ý¤¹¤ë¤Î¤Ë½½Ê¬¤ÊÎΰ褬¤Ê¤¤¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¾å¤Ë¥­¡¼¥¹¥È¥¢¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤ËȯÀ¸¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï°ìÏ¢¤ÎÏ¢·ë¤µ¤ì¤¿X\&.509¾ÚÌÀ½ñ¡¢PKCS#7·Á¼°¤Îñ°ì¥Ç¡¼¥¿¡¦¥Ö¥í¥Ã¥¯¤Î¤¤¤º¤ì¤«¤È¤Ê¤ê¡¢¤½¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¤Ï¥Ð¥¤¥Ê¥ê¡¦¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°¡¢Internet RFC 1421ɸ½à¤Çµ¬Äꤵ¤ì¤ë°õºþ²Äǽ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°·Á¼°(Base64¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤â¸Æ¤Ð¤ì¤ë)¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verbose
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¾éĹ¥â¡¼¥É¤ÇÆ°ºî¤·¡¢¤³¤Î¥â¡¼¥É¤Ç¤Ï¡¢\fIjarsigner\fR¤Ï¡¢JAR¤Î½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤Î¿Ê¹Ô¾õ¶·¤Ë´Ø¤¹¤ëÄɲþðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-internalsf
-+.RS 4
-+°ÊÁ°¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤¿\fI\&.DSA\fR
-+(½ð̾¥Ö¥í¥Ã¥¯)¥Õ¥¡¥¤¥ë¤Ë¡¢À¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Î¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿´°Á´¤Ê¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤·¤¿¡£ ¤³¤ÎÆ°ºî¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£½ÐÎÏJAR¥Õ¥¡¥¤¥ëÁ´ÂΤΥµ¥¤¥º¤ò¾®¤µ¤¯¤¹¤ë¤¿¤á¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Ë¤Ï\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-internalsf\fR¤ò»ØÄꤷ¤¿¾ì¹ç¡¢°ÊÁ°¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Æ¥¹¥È¤ò¹Ô¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¼ÂºÝ¤Ë¤Ï¡¢\fI\-internalsf\fR¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤¬Â礭¤¯¤Ê¤ë¤¿¤á¡¢»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-sectionsonly
-+.RS 4
-+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fI\-sectionsonly\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤ËÀ¸À®¤µ¤ì¤ë\fI\&.SF\fR¥Õ¥¡¥¤¥ë(½ð̾¥Õ¥¡¥¤¥ë)¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤ò´Þ¤à¥Ø¥Ã¥À¡¼¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë´Þ¤Þ¤ì¤ë¤Î¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë´ØÏ¢¤¹¤ë¾ðÊ󤪤è¤Ó¥Ï¥Ã¥·¥å¤Î¤ß¤Ç¤¹¡£½ð̾¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ºÇŬ²½¤Î¤¿¤á¤Ë¡¢¤³¤Î¥Ø¥Ã¥À¡¼¤¬Äɲ䵤ì¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¤¿¤Ó¤Ë¡¢¸¡¾Ú¤Ç¤Ï¡¢¤Þ¤º¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥå·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£°ìÃפ¹¤ë¾ì¹ç¡¢¸¡¾Ú¤Ï¼¡¤Î¼ê½ç¤Ë¿Ê¤ß¤Þ¤¹¡£°ìÃפ·¤Ê¤¤¾ì¹ç¡¢\fI\&.SF\fR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤¤¤¦¡¢¤¢¤Þ¤êºÇŬ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¸¡¾Ú¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+\fI\-sectionsonly\fR¥ª¥×¥·¥ç¥ó¤Ï¡¢¼ç¤Ë¥Æ¥¹¥ÈÍѤ˻ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤ò»ÈÍѤ¹¤ë¤È¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤¬Â礭¤¯¤Ê¤ë¤¿¤á¡¢¥Æ¥¹¥ÈÍѰʳ°¤Ç¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-protected
-+.RS 4
-+\fItrue\fR¤Þ¤¿¤Ï\fIfalse\fR¤Î¤¤¤º¤ì¤«¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£ÀìÍÑPIN¥ê¡¼¥À¡¼¤Ê¤É¤ÎÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹¤Ë¤è¤Ã¤Æ¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¢\fItrue\fR¤ò»ØÄꤷ¤Þ¤¹¡£
-+.RE
-+.PP
-+\-providerClass \fIprovider\-class\-name\fR
-+.RS 4
-+°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤¬\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢¤½¤Î¥Þ¥¹¥¿¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-providerArg \fR\fIConfigFilePath\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ·¡¢\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤Ï¡¢¥×¥í¥Ð¥¤¥À¤òưŪ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢¥È¡¼¥¯¥ó¹½À®¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ë\fIConfigFilePath\fR¤ò»ÈÍѤ·¤Þ¤¹¡£¼¡¤ÎÎã¤Ï¡¢Oracle PKCS #11¥×¥í¥Ð¥¤¥À¤¬¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë\fIPKCS #11\fR¥­¡¼¥¹¥È¥¢¤ò°ìÍ÷ɽ¼¨¤¹¤ë¥³¥Þ¥ó¥É¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \e
-+ \-providerClass sun\&.security\&.pkcs11\&.SunPKCS11 \e
-+ \-providerArg /mydir1/mydir2/token\&.config \e
- \-list
--.fl
--\fP
- .fi
--.TP 3
--\-providerName providerName
--\f2java.security\fP¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Ç2¤Ä°Ê¾å¤Î¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2\-providerName\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÆÃÄê¤Î¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î̾Á°¤Ç¤¹¡£
--.br
--.br
--Sun PKCS#11¥×¥í¥Ð¥¤¥À¤Î¾ì¹ç¡¢\f2providerName\fP¤Ï\f2SunPKCS11\-\fP\f2TokenName\fP¤È¤¤¤¦·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤³¤Ç\f2TokenName\fP¤Ï¡¢¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤¬¹½À®¤µ¤ì¤¿Ì¾Á°¤ÎÀÜÈø¼­¤Ç¤¹¡£¾ÜºÙ¤Ï
--.na
--\f2¹½À®Â°À­¤Îɽ\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ì¾Á°ÀÜÈø¼­\f2SmartCard\fP¤ÎPKCS#11¥­¡¼¥¹¥È¥¢¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÆâÍƤò¥ê¥¹¥È¤·¤Þ¤¹¡£
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerName SunPKCS11\-SmartCard \\
--.fl
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-providerName \fIproviderName\fR
-+.RS 4
-+\fIjava\&.security\fR¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Ç2¤Ä°Ê¾å¤Î¥×¥í¥Ð¥¤¥À¤¬¹½À®¤µ¤ì¤¿¾ì¹ç¡¢\fI\-providerName\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤òÂоݤˤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î̾Á°¤Ç¤¹¡£
-+.sp
-+Oracle PKCS #11¥×¥í¥Ð¥¤¥À¤Î¾ì¹ç¡¢\fIproviderName\fR¤Ï\fISunPKCS11\-\fR\fITokenName\fR¤È¤¤¤¦·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤³¤Ç¡¢¹½À®Â°À­¤Îɽ¤Ç¾ÜºÙ¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢\fITokenName\fR¤Ï¡¢¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤¬¹½À®¤µ¤ì¤¿Ì¾Á°¤ÎÀÜÈø¼­¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ì¾Á°ÀÜÈø¼­\fISmartCard\fR¤Î\fIPKCS #11\fR¥­¡¼¥¹¥È¥¢¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÆâÍƤò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore NONE \-storetype PKCS11 \e
-+ \-providerName SunPKCS11\-SmartCard \e
- \-list
--.fl
--\fP
- .fi
--.TP 3
--\-Jjavaoption
--»ØÄꤵ¤ì¤¿\f2javaoption\fPʸ»úÎó¤òJava¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£(\f3jarsigner\fP¤Ï¡¢¼ÂºÝ¤Ë¤ÏJava¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¡Ö¥é¥Ã¥Ñ¡¼¡×¤Ç¤¹¡£)¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ØÄê¤Ç¤­¤ë¥¤¥ó¥¿¥×¥ê¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2java \-h\fP¤Þ¤¿¤Ï\f2java \-X\fP¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-tsa url
--\f2¡Ö\-tsa http://example.tsa.url¡×\fP¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£URL\f2http://example.tsa.url\fP¤Ï¡¢TSA(Time Stamping Authority)¤Î¾ì½ê¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2\-tsacert\fP¥ª¥×¥·¥ç¥ó¤Ç¸¡½Ð¤µ¤ì¤¿URL¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\f2\-tsa\fP¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
--.br
--.br
--¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢\f2jarsigner\fP¤Ï¡¢
--.na
--\f2RFC 3161\fP @
--.fi
--http://www.ietf.org/rfc/rfc3161.txt¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥×¥í¥È¥³¥ë(TSP)¤ò»ÈÍѤ·¤ÆTSA¤ÈÄÌ¿®¤·¤Þ¤¹¡£À®¸ù¤¹¤ë¤È¡¢TSA¤«¤éÊÖ¤µ¤ì¤¿¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥È¡¼¥¯¥ó¤Ï½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤Î½ð̾¤È¤È¤â¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
--.TP 3
--\-tsacert alias
--\f2¡Ö\-tsacert alias¡×\fP¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\f2alias\fP¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¸½ºßÍ­¸ú¤ÊTSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ç¡¢TSA¤Î¾ì½ê¤òÆÃÄꤹ¤ëURL¤ò´Þ¤àSubject Information Access³ÈÄ¥µ¡Ç½¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
--.br
--.br
--\f2\-tsacert\fP¤ò»ÈÍѤ·¤¿¾ì¹ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 3
--\-altsigner class
--ÂåÂؽð̾µ¡¹½¤ò»ÈÍѤ¹¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤Ç¡¢\f2com.sun.jarsigner.ContentSigner\fPÃê¾Ý¥¯¥é¥¹¤ò³ÈÄ¥¤¹¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ï¡¢\f2\-altsignerpath\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£\f2\-altsigner\fP¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤ë¤È¡¢\f2jarsigner\fP¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾µ¡¹½¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\f2jarsigner\fP¤Ï¥Ç¥Õ¥©¥ë¥È¤Î½ð̾µ¡¹½¤ò»ÈÍѤ·¤Þ¤¹¡£
--.br
--.br
--¤¿¤È¤¨¤Ð¡¢\f2com.sun.sun.jarsigner.AuthSigner\fP¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾µ¡¹½¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\f2jarsigner\fP¤Ç\f2¡Ö\-altsigner com.sun.jarsigner.AuthSigner¡×\fP¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
--.TP 3
--\-altsignerpath classpathlist
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë(¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ÏÁ°½Ò¤Î\f2\-altsigner\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤷ¤Þ¤¹)¤ª¤è¤Ó¤½¤Î¥¯¥é¥¹¤¬°Í¸¤¹¤ë¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ë¾ì¹ç¡¢°Ê²¼¤ÎÎã¤Î¤è¤¦¤ËJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Þ¤¹¡£
--.br
--.br
--ÀäÂХѥ¹¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f2classpathlist\fP¤ËÊ£¿ô¤Î¥Ñ¥¹¤äJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤ì¤é¤òSolaris¤Î¾ì¹ç¤Ï¥³¥í¥ó(\f2:\fP)¤Ç¡¢Windows¤Î¾ì¹ç¤Ï¥»¥ß¥³¥í¥ó(\f2;\fP)¤Ç¤½¤ì¤¾¤ì¶èÀÚ¤ê¤Þ¤¹¡£ÌÜŪ¤Î¥¯¥é¥¹¤¬¤¹¤Ç¤Ë¸¡º÷¥Ñ¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍפǤ¹¡£
--.br
--.br
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤à¡¢JAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-J\fIjavaoption\fR
-+.RS 4
-+»ØÄꤵ¤ì¤¿\fIjavaoption\fRʸ»úÎó¤òJava¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤ·¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¡¢¥¤¥ó¥¿¥×¥ê¥¿¤ËÂФ¹¤ë¥é¥Ã¥Ñ¡¼¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ØÄê¤Ç¤­¤ë¥¤¥ó¥¿¥×¥ê¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\fIjava \-h\fR¤Þ¤¿¤Ï\fIjava \-X\fR¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-tsa \fIurl\fR
-+.RS 4
-+\fI\-tsa http://example\&.tsa\&.url\fR¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£URL
-+\fIhttp://example\&.tsa\&.url\fR¤Ï¡¢Time Stamping Authority (TSA)¤Î¾ì½ê¤òÆÃÄꤷ¡¢\fI\-tsacert\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¸¡½Ð¤µ¤ì¤¿URL¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\fI\-tsa\fR¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢\fIjarsigner\fR¤Ï¡¢RFC 3161¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥×¥í¥È¥³¥ë(TSP)¤ò»ÈÍѤ·¤ÆTSA¤ÈÄÌ¿®¤·¤Þ¤¹¡£À®¸ù¤¹¤ë¤È¡¢TSA¤Ë¤è¤Ã¤ÆÊÖ¤µ¤ì¤¿¥¿¥¤¥à¥¹¥¿¥ó¥×¡¦¥È¡¼¥¯¥ó¤Ï¡¢½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤Î½ð̾¤È¤È¤â¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.PP
-+\-tsacert \fIalias\fR
-+.RS 4
-+\fI\-tsacert\fR
-+\fIalias\fR¤¬JAR¥Õ¥¡¥¤¥ë¤Î½ð̾»þ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¢¤ë¾ì¹ç¡¢½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ÊÌ̾¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÍ­¸ú¤ÊTSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤òÆÃÄꤷ¤Þ¤¹¡£¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ç¡¢TSA¤Î¾ì½ê¤òÆÃÄꤹ¤ëURL¤ò´Þ¤àSubject Information Access³ÈÄ¥µ¡Ç½¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£
-+.sp
-+\fI\-tsacert\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢TSA¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.PP
-+\-tsapolicyid \fIpolicyid\fR
-+.RS 4
-+TSA¥µ¡¼¥Ð¡¼¤ËÁ÷¿®¤¹¤ë¥Ý¥ê¥·¡¼ID¤ò¼±Ê̤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¼±ÊÌ»Ò(OID)¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢¥Ý¥ê¥·¡¼ID¤ÏÁ÷¿®¤µ¤ì¤º¡¢TSA¥µ¡¼¥Ð¡¼¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¥ê¥·¡¼ID¤òÁªÂò¤·¤Þ¤¹¡£
-+.sp
-+¥ª¥Ö¥¸¥§¥¯¥È¼±Ê̻Ҥϡ¢ITU Telecommunication Standardization Sector (ITU\-T)ɸ½à¤Ç¤¢¤ëX\&.696¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¼±Ê̻Ҥϡ¢Ä̾\fI1\&.2\&.3\&.4\fR¤Ê¤É¤Î¡¢Éé¤Ç¤Ï¤Ê¤¤¿ô»ú¤Î¥Ô¥ê¥ª¥É¶èÀÚ¤ê¤Î¥»¥Ã¥È¤Ç¤¹¡£
-+.RE
-+.PP
-+\-altsigner \fIclass\fR
-+.RS 4
-+¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ÂåÂؽð̾¥á¥«¥Ë¥º¥à¤ò»ØÄꤷ¤Þ¤¹¡£´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤Ï¡¢\fIcom\&.sun\&.jarsigner\&.ContentSigner\fRÃê¾Ý¥¯¥é¥¹¤ò³ÈÄ¥¤¹¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¼±Ê̤·¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ï¡¢\fI\-altsignerpath\fR¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£\fI\-altsigner\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥Ç¥Õ¥©¥ë¥È¤Î½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.sp
-+¤¿¤È¤¨¤Ð¡¢\fIcom\&.sun\&.sun\&.jarsigner\&.AuthSigner\fR¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤¬Ä󶡤¹¤ë½ð̾¥á¥«¥Ë¥º¥à¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢jarsigner¤Î¥ª¥×¥·¥ç¥ó\fI\-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fR¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.RE
-+.PP
-+\-altsignerpath \fIclasspathlist\fR
-+.RS 4
-+¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¤½¤ì¤¬°Í¸¤¹¤ëJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£\fI\-altsigner\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬JAR¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¤½¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£
-+.sp
-+ÀäÂХѥ¹¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁêÂХѥ¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\fIclasspathlist\fR¤ËÊ£¿ô¤Î¥Ñ¥¹¤äJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¤½¤ì¤é¤ò¡¢Oracle Solaris¤Î¾ì¹ç¤Ï¥³¥í¥ó(:)¤Ç¡¢Windows¤Î¾ì¹ç¤Ï¥»¥ß¥³¥í¥ó(;)¤Ç¡¢¤½¤ì¤¾¤ì¶èÀÚ¤ê¤Þ¤¹¡£ÌÜŪ¤Î¥¯¥é¥¹¤¬¤¹¤Ç¤Ë¸¡º÷¥Ñ¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍפǤ¹¡£
-+.sp
-+¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
--\-altsignerpath /home/user/lib/authsigner.jar
--.fl
--\fP
-+\-altsignerpath /home/user/lib/authsigner\&.jar
- .fi
--JAR¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
--.br
--.br
--¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
-+.if n \{\
-+.RE
-+.\}
-+¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò¾Êά¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
- .nf
--\f3
--.fl
- \-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
--.fl
--\fP
- .fi
--JAR¥Õ¥¡¥¤¥ë̾¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ëα°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-strict
--½ð̾¤Þ¤¿¤Ï¸¡¾Ú½èÍýÃæ¤Ë¡¢¤Ê¤ó¤é¤«¤Î·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¸«¤Ä¤«¤Ã¤¿·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢·Ù¹ð¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
--.TP 3
--\-verbose:sub\-options
--¸¡¾Ú½èÍý¤Î¾ì¹ç¡¢É½¼¨¤¹¤ë¾ðÊó¤ÎÎ̤ò·èÄꤹ¤ë¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤Ë»ØÄê¤Ç¤­¤Þ¤¹¡£\f2\-certs\fP¤â»ØÄꤷ¤¿¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥â¡¼¥É(¤Þ¤¿¤Ï¥µ¥Ö¥ª¥×¥·¥ç¥óall)¤Ç¤Ï¡¢¥¨¥ó¥È¥ê¤¬½èÍý¤µ¤ì¤ë¤¿¤Ó¤Ë¤½¤ì¤é¤Î³Æ¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¡¢¤½¤Î¸å¤ËJAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2\-certs\fP¤È\f2\-verbose:grouped\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤È¤½¤Î¾ÚÌÀ½ñ¾ðÊ󤬡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2\-certs\fP¤È\f2\-verbose:summary\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤È¤½¤Î¾ÚÌÀ½ñ¾ðÊ󤬥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¤¬¡¢³Æ¥¨¥ó¥È¥ê¤Î¾ÜºÙ¤¬¡Ö1¤Ä¤Î¥¨¥ó¥È¥ê(¤ª¤è¤Ó¤½¤ì°Ê¾å)¡×¤È¤·¤ÆÍ×Ì󤵤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Îã¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.if n \{\
-+.RE
-+.\}
-+.RE
-+.PP
-+\-strict
-+.RS 4
-+½ð̾¤Þ¤¿¤Ï¸¡¾Ú½èÍýÃæ¤Ë¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬È¯¹Ô¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¥³¥Þ¥ó¥É¤Ë¤è¤ê¸¡½Ð¤µ¤ì¤¿½ÅÂç¤Ê·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£¥¨¥é¡¼¤È·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+\-verbose \fIsuboptions\fR
-+.RS 4
-+¸¡¾Ú½èÍý¤Î¾ì¹ç¡¢\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢É½¼¨¤¹¤ë¾ðÊó¤ÎÎ̤ò·èÄꤹ¤ë¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤â»ØÄꤷ¤¿¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥â¡¼¥É(¤Þ¤¿¤Ï¥µ¥Ö¥ª¥×¥·¥ç¥ó\fIall\fR)¤Ç¤Ï¡¢¥¨¥ó¥È¥ê¤¬½èÍý¤µ¤ì¤ë¤¿¤Ó¤Ë³Æ¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¡¢¤½¤Î¸å¤ËJAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£\fI\-certs\fR¤ª¤è¤Ó\fI\-verbose:grouped\fR¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤¬¡¢¤½¤Î¾ÚÌÀ½ñ¾ðÊó¤È¤È¤â¤Ë¡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\fI\-certs\fR¤ª¤è¤Ó\fI\-verbose:summary\fR¥µ¥Ö¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Æ±¤¸½ð̾¼Ô¾ðÊó¤ò»ý¤Ä¥¨¥ó¥È¥ê¤¬¡¢¤½¤Î¾ÚÌÀ½ñ¾ðÊó¤È¤È¤â¤Ë¡¢¥°¥ë¡¼¥×²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£³Æ¥¨¥ó¥È¥ê¤Î¾ÜºÙ¤Ï¡¢\fI1¤Ä¤Î¥¨¥ó¥È¥ê(°Ê¾å)\fR¤Ë¤Þ¤È¤á¤é¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£Îã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.SH "¥¨¥é¡¼¤È·Ù¹ð"
-+.PP
-+½ð̾¤Þ¤¿¤Ï¸¡¾Ú¥×¥í¥»¥¹Ãæ¤Ë¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¡¢ÍÍ¡¹¤Ê¥¨¥é¡¼¤Þ¤¿¤Ï·Ù¹ð¤¬È¯¹Ô¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-+.PP
-+¾ã³²¤¬¤¢¤ë¾ì¹ç¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É1¤Ç½ªÎ»¤·¤Þ¤¹¡£¾ã³²¤Ï¤Ê¤¤¤¬¡¢1¤Ä°Ê¾å¤Î½ÅÂç¤Ê·Ù¹ð¤¬¤¢¤ë¾ì¹ç¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ\fB¤¤¤Ê¤¤\fR¾ì¹ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É0¤Ç½ªÎ»¤·¡¢\fI\-strict\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï·Ù¹ð¥³¡¼¥É¤ÎORÃͤǽªÎ»¤·¤Þ¤¹¡£¾ðÊó·Ù¹ð¤Î¤ß¤¬¤¢¤ë¡¢¤Þ¤¿¤Ï·Ù¹ð¤¬¤Þ¤Ã¤¿¤¯¤Ê¤¤¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¾ï¤Ë¥³¡¼¥É0¤Ç½ªÎ»¤·¤Þ¤¹¡£
-+.PP
-+¤¿¤È¤¨¤Ð¡¢¥¨¥ó¥È¥ê¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Ç¡¢¥Õ¥¡¥¤¥ë¤Î½ð̾¤òµö²Ä¤·¤Ê¤¤KeyUsage³ÈÄ¥µ¡Ç½¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ï¥³¡¼¥É12 (=4+8)¤Ç½ªÎ»¤·¤Þ¤¹¡£
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
-+.br
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+Unix¥Ù¡¼¥¹¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Ç¤Ï0¤«¤é255¤Þ¤Ç¤ÎÃͤΤߤ¬Í­¸ú¤Î¤¿¤á¡¢½ªÎ»¥³¡¼¥É¤ÏºÆÍøÍѤµ¤ì¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.PP
-+¼¡¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ë¤è¤êȯ¹Ô¤Ç¤­¤ë¥¨¥é¡¼¤ª¤è¤Ó·Ù¹ð¤Î̾Á°¡¢¥³¡¼¥É¡¢ÀâÌÀ¤òµ­½Ò¤·¤Þ¤¹¡£
-+.SS "¾ã³²"
-+.PP
-+¥³¥Þ¥ó¥É¥é¥¤¥ó²òÀÏ¥¨¥é¡¼¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¸°¥Ú¥¢¤ò¸¡º÷¤Ç¤­¤Ê¤¤¡¢¤Þ¤¿¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¼ºÇԤʤÉ(¸ÂÄꤵ¤ì¤Þ¤»¤ó)¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤Î¼ºÇÔÍýͳ¡£
-+.PP
-+failure
-+.RS 4
-+¥³¡¼¥É1¡£½ð̾¤Þ¤¿¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
-+.RE
-+.SS "½ÅÂç¤Ê·Ù¹ð"
-+.if n \{\
-+.sp
-+.\}
-+.RS 4
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBNote\fR
-+.ps -1
-+.br
-+.TS
-+allbox tab(:);
-+l.
-+T{
-+¥Î¡¼¥È
-+.PP
-+\fI\-strict\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢½ÅÂç¤Ê·Ù¹ð¤Ï¥¨¥é¡¼¤È¤·¤ÆÊó¹ð¤µ¤ì¤Þ¤¹¡£
-+T}
-+.TE
-+.sp 1
-+.sp .5v
-+.RE
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¤Ë¥¨¥é¡¼¤¬¤¢¤ë¡¢¤Þ¤¿¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë¾¤ÎÌäÂ꤬¤¢¤ë¤Ê¤É¡¢\fIjarsigner\fR¥³¥Þ¥ó¥É¤¬½ÅÂç¤Ê·Ù¹ð¤òȯ¹Ô¤¹¤ëÍýͳ¡£
-+.PP
-+hasExpiredCert
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Î¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+notYetValidCert
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬¤Þ¤ÀÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+chainNotValidated
-+.RS 4
-+¥³¡¼¥É4¡£¤³¤Îjar¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬Àµ¤·¤¯¸¡¾Ú¤Ç¤­¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badKeyUsage
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤ÎJAR¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎKeyUsage³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badExtendedKeyUsage
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎExtendedKeyUsage³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+badNetscapeCertType
-+.RS 4
-+¥³¡¼¥É8¡£¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎNetscapeCertType³ÈÄ¥µ¡Ç½¤¬¥³¡¼¥É½ð̾¤òµö²Ä¤·¤Ê¤¤¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+hasUnsignedEntry
-+.RS 4
-+¥³¡¼¥É16¡£¤³¤Îjar¤Ë¤Ï¡¢À°¹çÀ­¥Á¥§¥Ã¥¯¤ò¤·¤Æ¤¤¤Ê¤¤Ì¤½ð̾¤Î¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+notSignedByAlias
-+.RS 4
-+¥³¡¼¥É32¡£¤³¤Îjar¤Ë¤Ï¡¢»ØÄꤵ¤ì¤¿ÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ºÑ¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+aliasNotInStore
-+.RS 4
-+¥³¡¼¥É32¡£¤³¤Îjar¤Ë¤Ï¡¢¤³¤Î¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤½ð̾ºÑ¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-+.RE
-+.SS "¾ðÊó·Ù¹ð"
-+.PP
-+¾ðÊó·Ù¹ð¤Ë¤Ï¡¢¥¨¥é¡¼¤Ç¤Ï¤Ê¤¤¤¬ÉÔŬÀڤȤߤʤµ¤ì¤ë¤â¤Î¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¥³¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-+.PP
-+hasExpiringCert
-+.RS 4
-+¤³¤Îjar¤Ë¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤¬6¤«·î°ÊÆâ¤Ë´ü¸ÂÀÚ¤ì¤È¤Ê¤ë¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-+.RE
-+.PP
-+noTimestamp
-+.RS 4
-+¤³¤Îjar¤Ë¤Ï¡¢¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤Þ¤Ê¤¤½ð̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ê¤·¤Ç¤Ï¡¢½ð̾¼Ô¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü¸Â(·Á¼°¤Ï\fIYYYY\-MM\-DD\fR)¸å¤Þ¤¿¤Ï¾­Íè¤Î¼è¾ÃÆü¸å¡¢¥æ¡¼¥¶¡¼¤Ï¤³¤ÎJAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
- .RE
--
--.LP
- .SH "Îã"
--.LP
--.SS
--JAR¥Õ¥¡¥¤¥ë¤Î½ð̾
--.LP
--.LP
--bundle.jar¤È¤¤¤¦Ì¾Á°¤ÎJAR¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢working¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Îmystore¤È¤¤¤¦¥­¡¼¥¹¥È¥¢¤Ë¤¢¤ë¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤¬jane¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¡¢½ð̾¤òÉÕ¤±¤ë¤È¤·¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤Æsbundle.jar¤È¤¤¤¦½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¾å¤Î¥³¥Þ¥ó¥É¤Ç¤Ï\f2\-sigfile\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤ë.SF¥Õ¥¡¥¤¥ë¤È.DSA¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢ÊÌ̾¤«¤é¥Ç¥Õ¥©¥ë¥È̾¤¬ÉÕ¤±¤é¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤½¤ì¤é¤Î̾Á°¤Ï\f2JANE.SF\fP¤ª¤è¤Ó\f2JANE.DSA\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
--.LP
--.LP
--¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ÈÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤ë¥×¥í¥ó¥×¥È¤òɽ¼¨¤¹¤ë¾ì¹ç¤Ï¡¢¾å¤Î¥³¥Þ¥ó¥É¤òû½Ì¤·¤Æ¼¡¤Î¤è¤¦¤ËÆþÎϤǤ­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore
--.fl
-- \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢(¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î.keystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢)¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Ë¼¨¤¹¤è¤¦¤Ë¡¢¥­¡¼¥¹¥È¥¢¤Î»ØÄê¤ò¾Êά¤Ç¤­¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--ºÇ¸å¤Ë¡¢ÆþÎÏJAR¥Õ¥¡¥¤¥ë(\f2bundle.jar\fP)¤ò½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Çñ½ã¤Ë¾å½ñ¤­¤¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë\f2\-signedjar\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.SS
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤¹¤ë¡¢¤Ä¤Þ¤ê½ð̾¤¬Í­¸ú¤ÇJAR¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify sbundle.jar
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢
--.LP
--.nf
--\f3
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤è¤ê¿¤¯¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\f2\-verbose\fP¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç\f3jarsigner\fP¤ò»ÈÍѤ¹¤ëÎã¤È¤½¤Î½ÐÎÏÎã¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify \-verbose sbundle.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx.class
--.fl
-- smk 849 Fri Sep 26 16:12:46 PDT 1997 test.class
--.fl
--
--.fl
-+.SS "JAR¥Õ¥¡¥¤¥ë¤Î½ð̾"
-+.PP
-+¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬\fIworking\fR¥Ç¥£¥ì¥¯¥È¥ê¤Î\fImystore\fR¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤Ë¤¢¤ë\fIjane\fR¤Ç¤¢¤ë¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Çbundle\&.jar¤Ë½ð̾¤·¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ësbundle\&.jar¤È¤¤¤¦Ì¾Á°¤òÉÕ¤±¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-storepass <keystore password>
-+ \-keypass <private key password> \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+Á°½Ò¤Î¥³¥Þ¥ó¥É¤Ç¤Ï\fI\-sigfile\fR¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤ëÀ¸À®¤µ¤ì¤¿\fI\&.SF\fR¥Õ¥¡¥¤¥ë¤ª¤è¤Ó\fI\&.DSA\fR¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢ÊÌ̾¤Ë´ð¤Å¤¤¤¿¥Ç¥Õ¥©¥ë¥È¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤é¤Ï¡¢Ì¾Á°ÉÕ¤­¤Î\fIJANE\&.SF\fR¤ª¤è¤Ó\fIJANE\&.DSA\fR¤Ç¤¹¡£
-+.PP
-+¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ª¤è¤ÓÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤òµá¤á¤é¤ì¤ë¾ì¹ç¡¢Á°½Ò¤Î¥³¥Þ¥ó¥É¤òû½Ì¤·¤Æ¡¢¼¡¤Î¤³¤È¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore
-+ \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¥­¡¼¥¹¥È¥¢¤¬¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢(¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î\&.keystore)¤Ç¤¢¤ë¾ì¹ç¡¢¼¡¤Ë¼¨¤¹¤è¤¦¤Ë¡¢¥­¡¼¥¹¥È¥¢¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-signedjar sbundle\&.jar bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+ÆþÎÏJAR¥Õ¥¡¥¤¥ë(bundle\&.jar)¤ò½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Ç¾å½ñ¤­¤¹¤ë¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë\fI\-signedjar\fR¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner bundle\&.jar jane
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú"
-+.PP
-+½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤Æ¡¢½ð̾¤¬Í­¸ú¤ÇJAR¥Õ¥¡¥¤¥ë¤¬²þ¤¶¤ó¤µ¤ì¤Ê¤«¤Ã¤¿¤³¤È¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-verify sbundle\&.jar
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+¸¡¾Ú¤¬À®¸ù¤¹¤ë¤È¡¢\fIjar verified\fR¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£Í­¸ú¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¾ÜºÙ¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¤ò\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ¹¤ë¥µ¥ó¥×¥ë¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-verify \-verbose sbundle\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx\&.class
-+ smk 849 Fri Sep 26 16:12:46 PDT 1997 test\&.class
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.SS
--¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤¿¸¡¾Ú
--.LP
--.LP
--¸¡¾Ú»þ¤Ë\f2\-verify\fP¤È\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¤Æ\f2\-certs\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊó¤â½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¼±ÊÌ̾¾ðÊó(X.509¾ÚÌÀ½ñ¤Î¾ì¹ç¤Î¤ß)¡¢¤ª¤è¤ÓJAR¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Î¾ÚÌÀ½ñ¤Ë°ìÃפ·¤¿¾ì¹ç¤Ë¤Ï¡¢³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¼¡¤Ë¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.SF
--.fl
-- 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst.class
--.fl
--
--.fl
-- X.509, CN=Test Group, OU=Java Software, O=Sun Microsystems, L=CUP, S=CA, C=US (javatest)
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
--
--.fl
-+
-+ jar verified\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SS "¾ÚÌÀ½ñ¾ðÊó¤ò»ÈÍѤ·¤¿¸¡¾Ú"
-+.PP
-+\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò\fI\-verify\fR¤ª¤è¤Ó\fI\-verbose\fR¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î³Æ½ð̾¼Ô¤Î¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤ˴ޤޤì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ë¤Ï¡¢¾ÚÌÀ½ñ¥¿¥¤¥×¡¢½ð̾¼Ô¤Î¼±ÊÌ̾¾ðÊó(X\&.509¾ÚÌÀ½ñ¤Î¾ì¹ç)¤¬´Þ¤Þ¤ì¡¢´Ý¥«¥Ã¥³Æâ¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸ø³«¸°¾ÚÌÀ½ñ¤¬¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Î¸ø³«¸°¾ÚÌÀ½ñ¤Ë°ìÃפ¹¤ë¾ì¹ç¤Î½ð̾¼Ô¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.SF
-+ 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.DSA
-+ smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst\&.class
-+
-+ X\&.509, CN=Test Group, OU=Java Software, O=Oracle, L=CUP, S=CA, C=US (javatest)
-+ X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤¬X.509¾ÚÌÀ½ñ¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¼±ÊÌ̾¾ðÊó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Î¥¿¥¤¥×¤ÈÊÌ̾¤Î¤ß¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ¤¬PGP¾ÚÌÀ½ñ¤Ç¡¢ÊÌ̾¤¬bob¤Î¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- PGP, (bob)
--.fl
--\fP
--.fi
--
--.LP
--.SS
--¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ð̾¼Ô¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
--.LP
--.LP
--JAR¥Õ¥¡¥¤¥ë¤¬¡¢JDK 1.1¤Î\f3javakey\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢½ð̾¼Ô¤Ï¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎϤˤϡÖi¡×¤È¤¤¤¦µ­¹æ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤¬¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¡Ök¡×¤È¡Öi¡×¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f2\-certs\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ï³ç¸Ì¤Ç°Ï¤Þ¤ì¤ë¤Î¤ËÂФ·¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.SF
--.fl
-- 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.DSA
--.fl
-- smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile.html
--.fl
--
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
-- X.509, CN=Duke, OU=Java Software, O=Sun, L=cup, S=ca, C=us [duke]
--.fl
--
--.fl
-+
-+ jar verified\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+½ð̾¼Ô¤Î¾ÚÌÀ½ñ¤¬X\&.509¾ÚÌÀ½ñ¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¼±ÊÌ̾¾ðÊó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Î¥¿¥¤¥×¤ÈÊÌ̾¤Î¤ß¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ¤¬PGP¾ÚÌÀ½ñ¤Ç¡¢ÊÌ̾¤¬\fIbob\fR¤Ç¤¢¤ë¾ì¹ç¡¢\fIPGP, (bob)\fR¤ò¼èÆÀ¤·¤Þ¤¹¡£
-+.SS "¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ð̾¼Ô¤ò´Þ¤à¸¡¾Ú"
-+.PP
-+JAR¥Õ¥¡¥¤¥ë¤¬JDK 1\&.1¤Î\fIjavakey\fR¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¡¢½ð̾¼Ô¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤Ç¤¢¤ë¾ì¹ç¡¢¸¡¾Ú¤Î½ÐÎϤˤÏ\fIi\fR¤¬´Þ¤Þ¤ì¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÊÌ̾¤È¥­¡¼¥¹¥È¥¢Æâ¤ÎÊÌ̾¤ÎξÊý¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¾ì¹ç¡¢\fIk\fR¤È\fIi\fR¤ÎξÊý¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-+.PP
-+\fI\-certs\fR¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ë»ÈÍѤµ¤ì¤ë´Ý¥«¥Ã¥³¤Ç¤Ï¤Ê¤¯¡¢Â祫¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+ jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar
-+
-+ 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF
-+ 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF
-+ 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA
-+ 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF
-+ 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA
-+ smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html
-+
-+ X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)
-+ X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]
-+
- s = signature was verified
--.fl
- m = entry is listed in manifest
--.fl
- k = at least one certificate was found in keystore
--.fl
- i = at least one certificate was found in identity scope
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--ÊÌ̾duke¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¤³¤ÎÊÌ̾¤Ï¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ç¤Ï¤Ê¤¯¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ç¤¹¡£
--.LP
--.SH "·Ù¹ð"
--.LP
--½ð̾/¸¡¾Ú½èÍýÃæ¤Ë¤Ï¡¢jarsigner¤«¤éÍÍ¡¹¤Ê·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î·Ù¹ð¥³¡¼¥É¤Ï¼¡¤Î¤è¤¦¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
--.nf
--\f3
--.fl
-- hasExpiringCert 2
--.fl
-- This jar contains entries whose signer certificate will expire within six months
--.fl
--
--.fl
-- hasExpiredCert 4
--.fl
-- This jar contains entries whose signer certificate has expired.
--.fl
--
--.fl
-- notYetValidCert 4
--.fl
-- This jar contains entries whose signer certificate is not yet valid.
--.fl
--
--.fl
-- chainNotValidated 4
--.fl
-- This jar contains entries whose certificate chain cannot be correctly validated.
--.fl
--
--.fl
-- badKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--.fl
--
--.fl
-- badExtendedKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's ExtendedKeyUsage extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- badNetscapeCertType 8
--.fl
-- This jar contains entries whose signer certificate's NetscapeCertType extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- hasUnsignedEntry 16
--.fl
-- This jar contains unsigned entries which have not been integrity\-checked.
--.fl
--
--.fl
-- notSignedByAlias 32
--.fl
-- This jar contains signed entries which are not signed by the specified alias(es)
--.fl
--
--.fl
-- aliasNotInStore 32
--.fl
-- This jar contains signed entries that are not signed by alias in this keystore
--.fl
--
--.fl
--\fP
--.fi
--
--.LP
--.LP
--\f2\-strict\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¸¡½Ð¤µ¤ì¤¿·Ù¹ð¤ÎOR¤ò¼è¤Ã¤¿Ãͤ¬¥Ä¡¼¥ë¤Î½ªÎ»¥³¡¼¥É¤È¤·¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¨¥ó¥È¥ê¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¡¢¤«¤Ä¤½¤Î¾ÚÌÀ½ñ¤ÎkeyUsage³ÈÄ¥¤Ç¥Õ¥¡¥¤¥ë¤Î½ð̾¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢½ªÎ»¥³¡¼¥É12(=4+8)¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
--.LP
--.LP
--\f3Ãí°Õ\fP: UNIX¤Ç»ÈÍѲÄǽ¤ÊÃͤÏ0¤«¤é255¤Î¤ß¤Ç¤¢¤ë¤¿¤á¡¢½ªÎ»¥³¡¼¥É¤ÏºÆÍøÍѤµ¤ì¤Þ¤¹¡£¤¤¤º¤ì¤Ë¤·¤Æ¤â¡¢½ð̾/¸¡¾Ú½èÍý¤¬¼ºÇÔ¤¹¤ë¤È¡¢¼¡¤Î½ªÎ»¥³¡¼¥É¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
--.LP
--.nf
--\f3
--.fl
--failure 1
--.fl
--\fP
--.fi
--
--.LP
--.SS
--JDK 1.1¤È¤Î¸ß´¹À­
--.LP
--.LP
--\f3keytool\fP¥Ä¡¼¥ë¤È\f3jarsigner\fP¥Ä¡¼¥ë¤Ï¡¢JDK 1.1¤ÇÄ󶡤µ¤ì¤Æ¤¤¤¿\f3javakey\fP¥Ä¡¼¥ë¤ò´°Á´¤ËÃÖ¤­´¹¤¨¤ë¤â¤Î¤Ç¤¹¡£¤³¤ì¤é¤Î¿·¤·¤¤¥Ä¡¼¥ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÈÈëÌ©¸°¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ëµ¡Ç½¤ä¡¢½ð̾¤ÎÀ¸À®¤Ë²Ã¤¨¤Æ½ð̾¤ò¸¡¾Ú¤¹¤ëµ¡Ç½¤Ê¤É¡¢\f3javakey\fP¤è¤ê¿¤¯¤Î¤òµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢\f3javakey\fP¤¬ºîÀ®¤·¤Æ´ÉÍý¤·¤Æ¤¤¤¿¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂå¤ï¤ë¤â¤Î¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢·Á¼°¤È¡¢1.1¤Î\f3javakey\fP¤¬»ÈÍѤ·¤Æ¤¤¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹·Á¼°¤È¤Î´Ö¤Ë¤Ï²¼°Ì¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¼¡¤Î¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
--.LP
--.RS 3
--.TP 2
--o
--\f3keytool\fP¤Î\f2\-identitydb\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ðÊó¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--\f3jarsigner\fP¤Ï¡¢°ÊÁ°¤Ë\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.TP 2
--o
--\f3jarsigner\fP¤Ï¡¢\f3javakey\fP¤ò»ÈÍѤ·¤Æ½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢Java 2 SDK¤Î¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î½ð̾¼ÔÊÌ̾¤òǧ¼±¤·¡¢¤³¤ì¤é¤òÂоݤ˽èÍý¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
--.RE
--
--.LP
--.LP
--¼¡¤Îɽ¤Ï¡¢JDK 1.1.x¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤¬¡¢Java 2¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤É¤Î¤è¤¦¤Ë°·¤ï¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
--.LP
--.LP
--.TS
--.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
--.de 35
--.ps \n(.s
--.vs \n(.vu
--.in \n(.iu
--.if \n(.u .fi
--.if \n(.j .ad
--.if \n(.j=0 .na
--..
--.nf
--.nr #~ 0
--.if n .nr #~ 0.6n
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.fc
--.nr 33 \n(.s
--.rm 80 81 82 83 84
--.nr 34 \n(.lu
--.eo
--.am 80
--.br
--.di a+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(80 .ll \n(80u
--.in 0
--\f3JAR¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥×\fP
--.br
--.di
--.nr a| \n(dn
--.nr a- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di b+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--\f31.1¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£\fP
--.br
--.di
--.nr b| \n(dn
--.nr b- \n(dl
--..
--.ec \
--.eo
--.am 82
--.br
--.di c+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(82 .ll \n(82u
--.in 0
--\f31.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava 2 Platform¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤ë¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£(4)\fP
--.br
--.di
--.nr c| \n(dn
--.nr c- \n(dl
--..
--.ec \
--.eo
--.am 83
--.br
--.di d+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(83 .ll \n(83u
--.in 0
--\f3¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤¬¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤ËÆø¢¤òÉÕÍ¿\fP
--.br
--.di
--.nr d| \n(dn
--.nr d- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di e+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr e| \n(dn
--.nr e- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di f+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr f| \n(dn
--.nr f- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di g+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢
--.br
--.di
--.nr g| \n(dn
--.nr g- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di h+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--¤Ï¤¤/¿®Íê¤Ç¤­¤Ê¤¤
--.br
--.di
--.nr h| \n(dn
--.nr h- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di i+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢(3)
--.br
--.di
--.nr i| \n(dn
--.nr i- \n(dl
--..
--.ec \
--.eo
--.am 81
--.br
--.di j+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(81 .ll \n(81u
--.in 0
--¤Ï¤¤/¿®Íê¤Ç¤­¤Ê¤¤
--.br
--.di
--.nr j| \n(dn
--.nr j- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di k+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢(1¡¢3)
--.br
--.di
--.nr k| \n(dn
--.nr k- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di l+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢¤È¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇÉÕÍ¿¤µ¤ì¤ëÆø¢
--.br
--.di
--.nr l| \n(dn
--.nr l- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di m+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢¤È¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤ÇÉÕÍ¿¤µ¤ì¤ëÆø¢(2)
--.br
--.di
--.nr m| \n(dn
--.nr m- \n(dl
--..
--.ec \
--.35
--.nf
--.ll \n(34u
--.nr 80 0
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾¤Î¤Ê¤¤JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \w½ð̾ÉÕ¤­JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.80
--.rm 80
--.nr 38 \n(a-
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 81 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \w¤Ï¤¤/¿®Íê¤Ç¤­¤ë
--.if \n(81<\n(38 .nr 81 \n(38
--.81
--.rm 81
--.nr 38 \n(b-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \n(h-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \n(j-
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 82 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(82<\n(38 .nr 82 \n(38
--.82
--.rm 82
--.nr 38 \n(c-
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 83 0
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤¤¤¤¤¨
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \w¤Ï¤¤
--.if \n(83<\n(38 .nr 83 \n(38
--.83
--.rm 83
--.nr 38 \n(d-
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 84 0
--.nr 38 \w\f3ÉÕÍ¿¤µ¤ì¤ëÆø¢\fP
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \w¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.if \n(84<\n(38 .nr 84 \n(38
--.84
--.rm 84
--.nr 38 \n(e-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(f-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(g-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(i-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(k-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(l-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(m-
--.if \n(84<\n(38 .nr 84 \n(38
--.35
--.nf
--.ll \n(34u
--.nr 38 1n
--.nr 79 0
--.nr 40 \n(79+(0*\n(38)
--.nr 80 +\n(40
--.nr 41 \n(80+(3*\n(38)
--.nr 81 +\n(41
--.nr 42 \n(81+(3*\n(38)
--.nr 82 +\n(42
--.nr 43 \n(82+(3*\n(38)
--.nr 83 +\n(43
--.nr 44 \n(83+(3*\n(38)
--.nr 84 +\n(44
--.nr TW \n(84
--.if t .if \n(TW>\n(.li .tm Table at line 1090 file Input is too wide - \n(TW units
--.fc  
--.nr #T 0-1
--.nr #a 0-1
--.eo
--.de T#
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.mk ##
--.nr ## -1v
--.ls 1
--.ls
--..
--.ec
--.ne \n(a|u+\n(.Vu
--.ne \n(b|u+\n(.Vu
--.ne \n(c|u+\n(.Vu
--.ne \n(d|u+\n(.Vu
--.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'\h'|\n(43u'\h'|\n(44u'\f3ÉÕÍ¿¤µ¤ì¤ëÆø¢\fP
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(40u
--.in +\n(37u
--.a+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.b+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(42u
--.in +\n(37u
--.c+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(43u
--.in +\n(37u
--.d+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(e|u+\n(.Vu
--.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.e+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(f|u+\n(.Vu
--.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾¤Î¤Ê¤¤JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.f+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(g|u+\n(.Vu
--.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.g+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(h|u+\n(.Vu
--.ne \n(i|u+\n(.Vu
--.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.h+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.i+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(j|u+\n(.Vu
--.ne \n(k|u+\n(.Vu
--.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
--.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(41u
--.in +\n(37u
--.j+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.k+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(l|u+\n(.Vu
--.if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤¤¤¤¤¨\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.l+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(m|u+\n(.Vu
--.if (\n(m|+\n(#^-1v)>\n(#- .nr #- +(\n(m|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤Ï¤¤\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.m+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤Ï¤¤\h'|\n(43u'¤¤¤¤¤¨\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'½ð̾ÉÕ¤­JAR\h'|\n(41u'¤Ï¤¤/¿®Íê¤Ç¤­¤ë\h'|\n(42u'¤¤¤¤¤¨\h'|\n(43u'¤Ï¤¤\h'|\n(44u'¤¹¤Ù¤Æ¤ÎÆø¢(1)
--.fc
--.nr T. 1
--.T# 1
--.35
--.rm a+
--.rm b+
--.rm c+
--.rm d+
--.rm e+
--.rm f+
--.rm g+
--.rm h+
--.rm i+
--.rm j+
--.rm k+
--.rm l+
--.rm m+
--.TE
--.if \n-(b.=0 .nr c. \n(.c-\n(d.-50
--
--.LP
--.LP
--Ãí°Õ:
--.LP
--.RS 3
--.TP 3
--1.
--¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤¬¤¢¤ë¾ì¹ç¡¢¤½¤ì¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤·¤Æ¡¢ÉÕÍ¿¤µ¤ì¤¿Æø¢¤Ë¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÀßÄ꤬ȿ±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
--.TP 3
--2.
--¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
--.TP 3
--3.
--Java 2¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¡¢¿®Íê¤Ç¤­¤Ê¤¤¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
--.TP 3
--4.
--Java 2 SDK¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤ë¤Î¤Ï¡¢¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Î¤ß¤Ç¤¹¡£
--.RE
--
--.LP
--.SH "´ØÏ¢¹àÌÜ"
--.LP
--.RS 3
--.TP 2
--o
--jar(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
--.TP 2
--o
--keytool(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
--.TP 2
--o
--\f3jarsigner\fP¥Ä¡¼¥ë¤Î»ÈÍÑÎã¤Ï¡¢
--.na
--\f4Java¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/index.html¤Î
--.na
--\f4¥»¥­¥å¥ê¥Æ¥£\fP @
-+
-+ jar verified\&.
- .fi
--http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
-+.if n \{\
- .RE
--
--.LP
--
-+.\}
-+.PP
-+\fBÃí°Õ: \fRÊÌ̾¤¬¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾¤Ç¤Ï¤Ê¤¯¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÌ̾¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹¤Ë¤Ï¡¢ÊÌ̾\fIduke\fR¤òÂ祫¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡£
-+.SH "JDK 1.1¤Î¸ß´¹À­"
-+.PP
-+\fIkeytool\fR¤ª¤è¤Ó\fIjarsigner\fR¥Ä¡¼¥ë¤Ï¡¢JDK 1\&.1¤Ë¤ª¤±¤ë\fIjavakey\fR¥Ä¡¼¥ë¤òÃÖ¤­´¹¤¨¤¿¤â¤Î¤Ç¤¹¡£¤³¤ì¤é¤Î¿·¤·¤¤¥Ä¡¼¥ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÈÈëÌ©¸°¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ëµ¡Ç½¤ä¡¢½ð̾¤ÎÀ¸À®¤Ë²Ã¤¨¤Æ½ð̾¤ò¸¡¾Ú¤¹¤ëµ¡Ç½¤Ê¤É¡¢\fIjavakey\fR¤è¤ê¿¤¯¤Î¤òµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
-+.PP
-+¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢\fIjavakey\fR¤¬ºîÀ®¤·¤Æ´ÉÍý¤·¤Æ¤¤¤¿¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂå¤ï¤ë¤â¤Î¤Ç¤¹¡£¥­¡¼¥¹¥È¥¢·Á¼°¤È¡¢JDK 1\&.1¤Î\fIjavakey\fR¤¬»ÈÍѤ·¤Æ¤¤¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹·Á¼°¤È¤Î´Ö¤Ë¤Ï¡¢²¼°Ì¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¼¡¤ÎÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIkeytool \-identitydb\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥­¡¼¥¹¥È¥¢¤Ë¾ðÊó¤ò¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\fIjavakey\fR¤Ç½ð̾¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JDK¤Î¥­¡¼¥¹¥È¥¢¤Ç¤Ï¤Ê¤¯JDK 1\&.1¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î½ð̾¼ÔÊÌ̾¤òǧ¼±¤·¡¢¤½¤ì¤òÂоݤ˽èÍý¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-+.RE
-+.SS "½ð̾¤Î¤Ê¤¤JAR"
-+.PP
-+½ð̾¤Î¤Ê¤¤JAR¤Ë¤Ï¡¢¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â¤¬¤¢¤ê¤Þ¤¹¡£
-+.SS "½ð̾ÉÕ¤­JAR"
-+.PP
-+½ð̾ÉÕ¤­JAR¤Ë¤Ï¡¢µ­½Ò¤É¤ª¤ê¤ÎJDK 1\&.1\&.\fIn\fR¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Î¥¹¥Æ¡¼¥¿¥¹¤Ë´ð¤Å¤¤¤¿¸¢¸Â¹½À®¤¬¤¢¤ê¤Þ¤¹¡£JDK¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤ë¤Î¤Ï¡¢¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Î¤ß¤Ç¤¹¡£
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fB¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤ËÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: ¤Ï¤¤/¿®Íꤵ¤ì¤Ê¤¤
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î3¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: ¤Ï¤¤/¿®Íꤵ¤ì¤Ê¤¤
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ª¤è¤Ó3¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÉÕÍ¿¤µ¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸¢¸Â¤ª¤è¤Ó¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î2¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÉÕÍ¿¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¸¢¸Â\fR
-+.RS 4
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.PP
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RS 4
-+1\&.1¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤Ï¤¤/¿®Íꤵ¤ì¤ë\fR
-+.RE
-+.RS 4
-+1\&.1\&.¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éJava¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£: \fB¤¤¤¤¤¨\fR
-+.RE
-+.RS 4
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£/ÊÌ̾¤Ø¤Î¸¢¸Â¤ÎÉÕÍ¿: \fB¤Ï¤¤\fR
-+.RE
-+.RS 4
-+Ãí°Õ¤Î1¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-+.RE
-+.RE
-+.sp
-+.it 1 an-trap
-+.nr an-no-space-flag 1
-+.nr an-break-flag 1
-+.br
-+.ps +1
-+\fBÃí°Õ\fR
-+.RS 4
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 1.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 1." 4.2
-+.\}
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Þ¤¿¤ÏÊÌ̾¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤¬¤¢¤ë¾ì¹ç¡¢¤½¤ì¤ò¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤·¤Æ¡¢ÉÕÍ¿¤µ¤ì¤¿¸¢¸Â¤Ë¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÀßÄ꤬ȿ±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 2.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 2." 4.2
-+.\}
-+¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04' 3.\h'+01'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP " 3." 4.2
-+.\}
-+Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¡¢¿®Íê¤Ç¤­¤Ê¤¤¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
-+.RE
-+.RE
-+.SH "»²¾È"
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+jar(1)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+keytool(1)
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html¤Ë¤¢¤ë
-+¡Ö¥³¡¼¥¹: Java SE¤Î¥»¥­¥å¥ê¥Æ¥£µ¡Ç½¡×
-+.RE
-+.br
-+'pl 8.5i
-+'bp
---- jdk/src/solaris/doc/sun/man/man1/jarsigner.1 2013-09-06 11:29:09.000000000 -0700
-+++ jdk/src/solaris/doc/sun/man/man1/jarsigner.1 2014-01-18 12:16:27.000000000 -0800
-@@ -1,1569 +1,985 @@
--." 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
--." under the terms of the GNU General Public License version 2 only, as
--." published by the Free Software Foundation.
--."
--." This code is distributed in the hope that it will be useful, but WITHOUT
--." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--." version 2 for more details (a copy is included in the LICENSE file that
--." accompanied this code).
--."
--." You should have received a copy of the GNU General Public License version
--." 2 along with this work; if not, write to the Free Software Foundation,
--." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--."
--." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--." or visit www.oracle.com if you need additional information or have any
--." questions.
--."
--.TH jarsigner 1 "16 Mar 2012"
--
--.LP
--.SH "Name"
--jarsigner \- JAR Signing and Verification Tool
--.LP
--.LP
--Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files.
--.LP
--.SH "SYNOPSIS"
--.LP
--.nf
--\f3
--.fl
--\fP\f3jarsigner\fP [ options ] jar\-file alias
--.fl
--\f3jarsigner\fP \-verify [ options ] jar\-file [alias...]
--.fl
--.fi
--
--.LP
--.LP
--The jarsigner \-verify command can take zero or more keystore alias names after the jar filename. When specified, jarsigner will check that the certificate used to verify each signed entry in the jar file matches one of the keystore aliases. The aliases are defined in the keystore specified by \-keystore, or the default keystore.
--.LP
--.SH "DESCRIPTION"
--.LP
--.LP
--The \f3jarsigner\fP tool is used for two purposes:
--.LP
--.RS 3
--.TP 3
--1.
--to sign Java ARchive (JAR) files, and
--.TP 3
--2.
--to verify the signatures and integrity of signed JAR files.
--.RE
--
--.LP
--.LP
--The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution. A tool named jar(1) enables developers to produce JAR files. (Technically, any zip file can also be considered a JAR file, although when created by \f3jar\fP or processed by \f3jarsigner\fP, JAR files also contain a META\-INF/MANIFEST.MF file.)
--.LP
--.LP
--A \f2digital signature\fP is a string of bits that is computed from some data (the data being "signed") and the private key of an entity (a person, company, etc.). Like a handwritten signature, a digital signature has many useful characteristics:
--.LP
--.RS 3
--.TP 2
--o
--Its authenticity can be verified, via a computation that uses the public key corresponding to the private key used to generate the signature.
--.TP 2
--o
--It cannot be forged, assuming the private key is kept secret.
--.TP 2
--o
--It is a function of the data signed and thus can't be claimed to be the signature for other data as well.
--.TP 2
--o
--The signed data cannot be changed; if it is, the signature will no longer verify as being authentic.
--.RE
--
--.LP
--.LP
--In order for an entity's signature to be generated for a file, the entity must first have a public/private key pair associated with it, and also one or more certificates authenticating its public key. A \f2certificate\fP is a digitally signed statement from one entity, saying that the public key of some other entity has a particular value.
--.LP
--.LP
--\f3jarsigner\fP uses key and certificate information from a \f2keystore\fP to generate digital signatures for JAR files. A keystore is a database of private keys and their associated X.509 certificate chains authenticating the corresponding public keys. The keytool(1) utility is used to create and administer keystores.
--.LP
--.LP
--\f3jarsigner\fP uses an entity's private key to generate a signature. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file. \f3jarsigner\fP can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file).
--.LP
--.LP
--\f3jarsigner\fP can generate signatures that include a timestamp, thus enabling systems/deployer (including Java Plug\-in) to check whether the JAR file was signed while the signing certificate was still valid. In addition, APIs will allow applications to obtain the timestamp information.
--.LP
--.LP
--At this time, \f3jarsigner\fP can only sign JAR files created by the SDK jar(1) tool or zip files. (JAR files are the same as zip files, except they also have a META\-INF/MANIFEST.MF file. Such a file will automatically be created when \f3jarsigner\fP signs a zip file.)
--.LP
--.LP
--The default \f3jarsigner\fP behavior is to \f2sign\fP a JAR (or zip) file. Use the \f2\-verify\fP option to instead have it \f2verify\fP a signed JAR file.
--.LP
--.SS
--Keystore Aliases
--.LP
--.LP
--All keystore entities are accessed via unique \f2aliases\fP.
--.LP
--.LP
--When using \f3jarsigner\fP to sign a JAR file, you must specify the alias for the keystore entry containing the private key needed to generate the signature. For example, the following will sign the JAR file named "MyJARFile.jar", using the private key associated with the alias "duke" in the keystore named "mystore" in the "working" directory. Since no output file is specified, it overwrites MyJARFile.jar with the signed JAR file.
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password.
--.LP
--.SS
--Keystore Location
--.LP
--.LP
--\f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory.
--.LP
--.LP
--Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device.
--.LP
--.SS
--Keystore Implementation
--.LP
--.LP
--The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
--.LP
--.LP
--Currently, there are two command\-line tools that make use of keystore implementations (\f3keytool\fP and \f3jarsigner\fP), and also a GUI\-based tool named \f3Policy Tool\fP. Since \f2KeyStore\fP is publicly available, Java 2 SDK users can write additional security applications that use it.
--.LP
--.LP
--There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
--.LP
--.LP
--Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a provider and supply a KeystoreSpi subclass implementation, as described in
--.na
--\f2How to Implement a Provider for the Java Cryptography Architecture\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
--.LP
--.LP
--Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
--.LP
--.LP
--\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
--.LP
--.LP
--For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu.
--.LP
--.LP
--If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the SDK security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
--.LP
--.LP
--Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
--.LP
--.LP
--The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
--.LP
--.nf
--\f3
--.fl
-- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file:
--.LP
--.nf
--\f3
--.fl
-- keystore.type=jks
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: Case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks".
--.LP
--.LP
--To have the tools utilize a keystore implementation other than the default, change that line to specify a different keystore type. For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to
--.LP
--.nf
--\f3
--.fl
-- keystore.type=pkcs12
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that if you us the PKCS#11 provider package, you should refer to the
--.na
--\f2KeyTool and JarSigner\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
--.LP
--.SS
--Supported Algorithms
--.LP
--.LP
--By default, \f3jarsigner\fP signs a JAR file using one of the following:
--.LP
--.RS 3
--.TP 2
--o
--DSA (Digital Signature Algorithm) with the SHA1 digest algorithm
--.TP 2
--o
--RSA algorithm with the SHA256 digest algorithm.
--.TP 2
--o
--EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm).
--.RE
--
--.LP
--.LP
--That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm.
--.LP
--.LP
--These default signature algorithms can be overridden using the \f2\-sigalg\fP option.
--.LP
--.SS
--The Signed JAR File
--.LP
--.LP
--When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory:
--.LP
--.RS 3
--.TP 2
--o
--a signature file, with a .SF extension, and
--.TP 2
--o
--a signature block file, with a .DSA, .RSA, or .EC extension.
--.RE
--
--.LP
--.LP
--The base file names for these two files come from the value of the \f2\-sigFile\fP option. For example, if the option appears as
--.LP
--.nf
--\f3
--.fl
--\-sigFile MKSIGN
--.fl
--\fP
--.fi
--
--.LP
--.LP
--The files are named "MKSIGN.SF" and "MKSIGN.DSA".
--.LP
--.LP
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens.
--.LP
--\f3The Signature (.SF) File\fP
--.LP
--.LP
--A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following:
--.LP
--.RS 3
--.TP 2
--o
--the file name,
--.TP 2
--o
--the name of the digest algorithm used (SHA), and
--.TP 2
--o
--a SHA digest value.
--.RE
--
--.LP
--.LP
--In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file. In the .SF file, on the other hand, the digest value for a given source file is the hash of the three lines in the manifest file for the source file.
--.LP
--.LP
--The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification.
--.LP
--\f3The Signature Block File\fP
--.LP
--The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used.
--.SS
--Signature Timestamp
--.LP
--.LP
--\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options:
--.LP
--.RS 3
--.TP 2
--o
--\f2\-tsa url\fP
--.TP 2
--o
--\f2\-tsacert alias\fP
--.TP 2
--o
--\f2\-altsigner class\fP
--.TP 2
--o
--\f2\-altsignerpath classpathlist\fP
--.RE
--
--.LP
--.LP
--Each of these options is detailed in the Options section below.
--.LP
--.SS
--JAR File Verification
--.LP
--.LP
--A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps:
--.LP
--.RS 3
--.TP 3
--1.
--Verify the signature of the .SF file itself.
--.br
--.br
--That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with.
--.TP 3
--2.
--Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest.
--.br
--.br
--The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step.
--.br
--.br
--If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File).
--.br
--.br
--One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file.
--.TP 3
--3.
--Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails.
--.RE
--
--.LP
--.LP
--If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP.
--.LP
--.SS
--Multiple Signatures for a JAR File
--.LP
--.LP
--A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner myBundle.jar susan
--.fl
-- jarsigner myBundle.jar kevin
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When a JAR file is signed multiple times, there are multiple .SF and .DSA files in the resulting JAR file, one pair for each signature. Thus, in the example above, the output JAR file includes files with the following names:
--.LP
--.nf
--\f3
--.fl
-- SUSAN.SF
--.fl
-- SUSAN.DSA
--.fl
-- KEVIN.SF
--.fl
-- KEVIN.DSA
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP.
--.LP
--.SH "OPTIONS"
--.LP
--.LP
--The various \f3jarsigner\fP options are listed and described below. Note:
--.LP
--.RS 3
--.TP 2
--o
--All option names are preceded by a minus sign (\-).
--.TP 2
--o
--The options may be provided in any order.
--.TP 2
--o
--Items in italics (option values) represent the actual values that must be supplied.
--.TP 2
--o
--The \f2\-keystore\fP, \f2\-storepass\fP, \f2\-keypass\fP, \f2\-sigfile\fP, \f2\-sigalg\fP, \f2\-digestalg\fP, and \f2\-signedjar\fP options are only relevant when signing a JAR file, not when verifying a signed JAR file. Similarly, an alias is only specified on the command line when signing a JAR file.
--.RE
--
--.LP
--.RS 3
--.TP 3
--\-keystore url
--Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property.
--.br
--.br
--A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default).
--.br
--.br
--A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore.
--.br
--.br
--Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is,
--.nf
--\f3
--.fl
-- \-keystore \fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--is treated as equivalent to
--.nf
--\f3
--.fl
-- \-keystore file:\fP\f4filePathAndName\fP\f3
--.fl
--\fP
--.fi
--If the Sun PKCS#11 provider has been configured in the \f2java.security\fP security properties file (located in the JRE's \f2$JAVA_HOME/lib/security\fP directory), then keytool and jarsigner can operate on the PKCS#11 token by specifying these options:
--.RS 3
--.TP 2
--o
--\f2\-keystore NONE\fP
--.TP 2
--o
--\f2\-storetype PKCS11\fP
--.RE
--For example, this command lists the contents of the configured PKCS#11 token:
--.nf
--\f3
--.fl
-- jarsigner \-keystore NONE \-storetype PKCS11 \-list
--.fl
--\fP
--.fi
--.TP 3
--\-storetype storetype
--Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP.
--.br
--.br
--The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified.
--.TP 3
--\-storepass[:env | :file] argument
--Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-keypass[:env | :file] argument
--Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it.
--.br
--.br
--If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows:
--.RS 3
--.TP 2
--o
--\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP
--.TP 2
--o
--\f2file\fP: Retrieve the password from the file named \f2argument\fP
--.RE
--Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system.
--.TP 3
--\-sigfile file
--Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file.
--.br
--.br
--The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names.
--.br
--.br
--If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name.
--.TP 3
--\-sigalg algorithm
--Specifies the name of the signature algorithm to use to sign the JAR file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-digestalg algorithm
--Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
--.br
--.br
--See
--.na
--\f2Appendix A\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed.
--.TP 3
--\-signedjar file
--Specifies the name to be used for the signed JAR file.
--.br
--.br
--If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file.
--.TP 3
--\-verify
--If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)"
--.br
--.br
--It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both.
--.br
--.br
--For further information on verification, see JAR File Verification.
--.TP 3
--\-certs
--If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes
--.RS 3
--.TP 2
--o
--the name of the type of certificate (stored in the .DSA file) that certifies the signer's public key
--.TP 2
--o
--if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer
--.RE
--The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed:
--.RS 3
--.TP 2
--o
--in parentheses, the alias name for the keystore entry for that signer. If the signer actually comes from a JDK 1.1 identity database instead of from a keystore, the alias name will appear in brackets instead of parentheses.
--.RE
--.TP 3
--\-certchain file
--Specifies the certificate chain to be used, if the certificate chain associated with the private key of the keystore entry, addressed by the alias specified on the command line, is not complete. This may happen if the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain. The file can be a sequence of X.509 certificates concatenated together, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as BASE64 encoding) as defined by the Internet RFC 1421 standard.
--.TP 3
--\-verbose
--If this appears on the command line, it indicates "verbose" mode, which causes \f3jarsigner\fP to output extra information as to the progress of the JAR signing or verification.
--.TP 3
--\-internalsf
--In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-sectionsonly
--If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File .
--.br
--.br
--By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file.
--.br
--.br
--For further information, see JAR File Verification.
--.br
--.br
--\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP
--.TP 3
--\-protected
--Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
--.TP 3
--\-providerClass provider\-class\-name
--Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP.
--.br
--.br
--Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file.
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerClass sun.security.pkcs11.SunPKCS11 \\
--.fl
-- \-providerArg /foo/bar/token.config \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-providerName providerName
--If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider.
--.br
--.br
--For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the
--.na
--\f2configuration attributes table\fP @
--.fi
--http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP:
--.nf
--\f3
--.fl
--jarsigner \-keystore NONE \-storetype PKCS11 \\
--.fl
-- \-providerName SunPKCS11\-SmartCard \\
--.fl
-- \-list
--.fl
--\fP
--.fi
--.TP 3
--\-Jjavaoption
--Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line.
--.TP 3
--\-tsa url
--If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore.
--.br
--.br
--To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in
--.na
--\f2RFC 3161\fP @
--.fi
--http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file.
--.TP 3
--\-tsacert alias
--If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA.
--.br
--.br
--The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP.
--.TP 3
--\-altsigner class
--Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism.
--.br
--.br
--For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP
--.TP 3
--\-altsignerpath classpathlist
--Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below.
--.br
--.br
--An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path.
--.br
--.br
--Example of specifying the path to a jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/lib/authsigner.jar
--.fl
--\fP
--.fi
--Note that the JAR file name is included.
--.br
--.br
--Example of specifying the path to the jar file that contains the class file:
--.nf
--\f3
--.fl
--\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
--.fl
--\fP
--.fi
--Note that the JAR file name is omitted.
--.TP 3
--\-strict
--During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details.
--.TP 3
--\-verbose:sub\-options
--For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information.
--.RE
--
--.LP
--.SH "EXAMPLES"
--.LP
--.SS
--Signing a JAR File
--.LP
--.LP
--Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar":
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3
--.fl
-- \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that there is no \f2\-sigfile\fP specified in the command above, so the generated .SF and .DSA files to be placed in the signed JAR file will have default names based on the alias name. That is, they will be named \f2JANE.SF\fP and \f2JANE.DSA\fP.
--.LP
--.LP
--If you want to be prompted for the store password and the private key password, you could shorten the above command to
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore
--.fl
-- \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the keystore to be used is the default keystore (the one named ".keystore" in your home directory), you don't need to specify a keystore, as in:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-signedjar sbundle.jar bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Finally, if you want the signed JAR file to simply overwrite the input JAR file (\f2bundle.jar\fP), you don't need to specify a \f2\-signedjar\fP option:
--.LP
--.nf
--\f3
--.fl
-- jarsigner bundle.jar jane
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verifying a Signed JAR File
--.LP
--.LP
--To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify sbundle.jar
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the verification is successful,
--.LP
--.nf
--\f3
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--is displayed. Otherwise, an error message appears.
--.LP
--.LP
--You can get more information if you use the \f2\-verbose\fP option. A sample use of \f3jarsigner\fP with the \f2\-verbose\fP option is shown below, along with sample output:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-verify \-verbose sbundle.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx.class
--.fl
-- smk 849 Fri Sep 26 16:12:46 PDT 1997 test.class
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification with Certificate Information
--.LP
--.LP
--If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example,
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.SF
--.fl
-- 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST.DSA
--.fl
-- smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst.class
--.fl
--
--.fl
-- X.509, CN=Test Group, OU=Java Software, O=Sun Microsystems, L=CUP, S=CA, C=US (javatest)
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--If the certificate for a signer is not an X.509 certificate, there is no distinguished name information. In that case, just the certificate type and the alias are shown. For example, if the certificate is a PGP certificate, and the alias is "bob", you'd get
--.LP
--.nf
--\f3
--.fl
-- PGP, (bob)
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Verification of a JAR File that Includes Identity Database Signers
--.LP
--.LP
--If a JAR file has been signed using the JDK 1.1 \f3javakey\fP tool, and thus the signer is an alias in an identity database, the verification output includes an "i" symbol. If the JAR file has been signed by both an alias in an identity database and an alias in a keystore, both "k" and "i" appear.
--.LP
--.LP
--When the \f2\-certs\fP option is used, any identity database aliases are shown in square brackets rather than the parentheses used for keystore aliases. For example:
--.LP
--.nf
--\f3
--.fl
-- jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile.jar
--.fl
--
--.fl
-- 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST.MF
--.fl
-- 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.SF
--.fl
-- 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE.DSA
--.fl
-- 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.SF
--.fl
-- 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE.DSA
--.fl
-- smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile.html
--.fl
--
--.fl
-- X.509, CN=Jane Smith, OU=Java Software, O=Sun, L=cup, S=ca, C=us (jane)
--.fl
-- X.509, CN=Duke, OU=Java Software, O=Sun, L=cup, S=ca, C=us [duke]
--.fl
--
--.fl
-- s = signature was verified
--.fl
-- m = entry is listed in manifest
--.fl
-- k = at least one certificate was found in keystore
--.fl
-- i = at least one certificate was found in identity scope
--.fl
--
--.fl
-- jar verified.
--.fl
--\fP
--.fi
--
--.LP
--.LP
--Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias.
--.LP
--.SH "WARNINGS"
--.LP
--During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows:
--.nf
--\f3
--.fl
-- hasExpiringCert 2
--.fl
-- This jar contains entries whose signer certificate will expire within six months
--.fl
--
--.fl
-- hasExpiredCert 4
--.fl
-- This jar contains entries whose signer certificate has expired.
--.fl
--
--.fl
-- notYetValidCert 4
--.fl
-- This jar contains entries whose signer certificate is not yet valid.
--.fl
--
--.fl
-- chainNotValidated 4
--.fl
-- This jar contains entries whose certificate chain cannot be correctly validated.
--.fl
--
--.fl
-- badKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--.fl
--
--.fl
-- badExtendedKeyUsage 8
--.fl
-- This jar contains entries whose signer certificate's ExtendedKeyUsage extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- badNetscapeCertType 8
--.fl
-- This jar contains entries whose signer certificate's NetscapeCertType extension
--.fl
-- doesn't allow code signing.
--.fl
--
--.fl
-- hasUnsignedEntry 16
--.fl
-- This jar contains unsigned entries which have not been integrity\-checked.
--.fl
--
--.fl
-- notSignedByAlias 32
--.fl
-- This jar contains signed entries which are not signed by the specified alias(es)
--.fl
--
--.fl
-- aliasNotInStore 32
--.fl
-- This jar contains signed entries that are not signed by alias in this keystore
--.fl
--
--.fl
--\fP
--.fi
--
--.LP
--.LP
--When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned.
--.LP
--.LP
--\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned:
--.LP
--.nf
--\f3
--.fl
--failure 1
--.fl
--\fP
--.fi
--
--.LP
--.SS
--Compatibility with JDK 1.1
--.LP
--.LP
--The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them.
--.LP
--.LP
--The new keystore architecture replaces the identity database that \f3javakey\fP created and managed. There is no backwards compatibility between the keystore format and the database format used by \f3javakey\fP in 1.1. However,
--.LP
--.RS 3
--.TP 2
--o
--It is possible to import the information from an identity database into a keystore, via the \f3keytool\fP \f2\-identitydb\fP command.
--.TP 2
--o
--\f3jarsigner\fP can sign JAR files also previously signed using \f3javakey\fP.
--.TP 2
--o
--\f3jarsigner\fP can verify JAR files signed using \f3javakey\fP. Thus, it recognizes and can work with signer aliases that are from a JDK 1.1 identity database rather than a Java 2 SDK keystore.
--.RE
--
--.LP
--.LP
--The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform.
--.LP
--.LP
--.TS
--.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
--.de 35
--.ps \n(.s
--.vs \n(.vu
--.in \n(.iu
--.if \n(.u .fi
--.if \n(.j .ad
--.if \n(.j=0 .na
--..
--.nf
--.nr #~ 0
--.if n .nr #~ 0.6n
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.fc
--.nr 33 \n(.s
--.rm 80 81 82 83 84
--.nr 34 \n(.lu
--.eo
--.am 82
--.br
--.di a+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(82 .ll \n(82u
--.in 0
--\f3Trusted Identity imported into Java 2 Platform keystore from 1.1 database (4)\fP
--.br
--.di
--.nr a| \n(dn
--.nr a- \n(dl
--..
--.ec \
--.eo
--.am 83
--.br
--.di b+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(83 .ll \n(83u
--.in 0
--\f3Policy File grants privileges to Identity/Alias\fP
--.br
--.di
--.nr b| \n(dn
--.nr b- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di c+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr c| \n(dn
--.nr c- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di d+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr d| \n(dn
--.nr d- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di e+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code.
--.br
--.di
--.nr e| \n(dn
--.nr e- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di f+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (3)
--.br
--.di
--.nr f| \n(dn
--.nr f- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di g+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code. (1,3)
--.br
--.di
--.nr g| \n(dn
--.nr g- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di h+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file.
--.br
--.di
--.nr h| \n(dn
--.nr h- \n(dl
--..
--.ec \
--.eo
--.am 84
--.br
--.di i+
--.35
--.ft \n(.f
--.ll \n(34u*1u/6u
--.if \n(.l<\n(84 .ll \n(84u
--.in 0
--Default privileges granted to all code plus privileges granted in policy file. (2)
--.br
--.di
--.nr i| \n(dn
--.nr i- \n(dl
--..
--.ec \
--.35
--.nf
--.ll \n(34u
--.nr 80 0
--.nr 38 \w\f3JAR File Type\fP
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wUnsigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.nr 38 \wSigned JAR
--.if \n(80<\n(38 .nr 80 \n(38
--.80
--.rm 80
--.nr 81 0
--.nr 38 \w\f3Identity in 1.1 database\fP
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Untrusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wNO
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.nr 38 \wYES/Trusted
--.if \n(81<\n(38 .nr 81 \n(38
--.81
--.rm 81
--.nr 82 0
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wYES
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 38 \wNO
--.if \n(82<\n(38 .nr 82 \n(38
--.82
--.rm 82
--.nr 38 \n(a-
--.if \n(82<\n(38 .nr 82 \n(38
--.nr 83 0
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wNO
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 38 \wYES
--.if \n(83<\n(38 .nr 83 \n(38
--.83
--.rm 83
--.nr 38 \n(b-
--.if \n(83<\n(38 .nr 83 \n(38
--.nr 84 0
--.nr 38 \w\f3Privileges Granted\fP
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \wAll privileges (1)
--.if \n(84<\n(38 .nr 84 \n(38
--.84
--.rm 84
--.nr 38 \n(c-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(d-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(e-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(f-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(g-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(h-
--.if \n(84<\n(38 .nr 84 \n(38
--.nr 38 \n(i-
--.if \n(84<\n(38 .nr 84 \n(38
--.35
--.nf
--.ll \n(34u
--.nr 38 1n
--.nr 79 0
--.nr 40 \n(79+(0*\n(38)
--.nr 80 +\n(40
--.nr 41 \n(80+(3*\n(38)
--.nr 81 +\n(41
--.nr 42 \n(81+(3*\n(38)
--.nr 82 +\n(42
--.nr 43 \n(82+(3*\n(38)
--.nr 83 +\n(43
--.nr 44 \n(83+(3*\n(38)
--.nr 84 +\n(44
--.nr TW \n(84
--.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units
--.fc  
--.nr #T 0-1
--.nr #a 0-1
--.eo
--.de T#
--.ds #d .d
--.if \(ts\n(.z\(ts\(ts .ds #d nl
--.mk ##
--.nr ## -1v
--.ls 1
--.ls
--..
--.ec
--.ne \n(a|u+\n(.Vu
--.ne \n(b|u+\n(.Vu
--.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
--.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'\f3JAR File Type\fP\h'|\n(41u'\f3Identity in 1.1 database\fP\h'|\n(42u'\h'|\n(43u'\h'|\n(44u'\f3Privileges Granted\fP
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(42u
--.in +\n(37u
--.a+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(##u-1v
--.nr 37 \n(43u
--.in +\n(37u
--.b+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(c|u+\n(.Vu
--.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.c+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(d|u+\n(.Vu
--.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Unsigned JAR\h'|\n(41u'NO\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.d+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(e|u+\n(.Vu
--.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.e+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(f|u+\n(.Vu
--.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.f+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(g|u+\n(.Vu
--.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Untrusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.g+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(h|u+\n(.Vu
--.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'NO\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.h+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ne \n(i|u+\n(.Vu
--.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'YES\h'|\n(44u'
--.mk ##
--.nr 31 \n(##
--.sp |\n(##u-1v
--.nr 37 \n(44u
--.in +\n(37u
--.i+
--.in -\n(37u
--.mk 32
--.if \n(32>\n(31 .nr 31 \n(32
--.sp |\n(31u
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'NO\h'|\n(44u'All privileges
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'YES\h'|\n(43u'NO\h'|\n(44u'All privileges (1)
--.ta \n(80u \n(81u \n(82u \n(83u \n(84u
--.nr 31 \n(.f
--.nr 35 1m
--\&\h'|\n(40u'Signed JAR\h'|\n(41u'YES/Trusted\h'|\n(42u'NO\h'|\n(43u'YES\h'|\n(44u'All privileges (1)
--.fc
--.nr T. 1
--.T# 1
--.35
--.rm a+
--.rm b+
--.rm c+
--.rm d+
--.rm e+
--.rm f+
--.rm g+
--.rm h+
--.rm i+
--.TE
--.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
--
--.LP
--.LP
--Notes:
--.LP
--.RS 3
--.TP 3
--1.
--If an identity/alias is mentioned in the policy file, it must be imported into the keystore for the policy file to have any effect on privileges granted.
--.TP 3
--2.
--The policy file/keystore combination has precedence over a trusted identity in the identity database.
--.TP 3
--3.
--Untrusted identities are ignored in the Java 2 platform.
--.TP 3
--4.
--Only trusted identities can be imported into Java 2 SDK keystores.
--.RE
--
--.LP
--.SH "SEE ALSO"
--.LP
--.RS 3
--.TP 2
--o
--jar(1) tool documentation
--.TP 2
--o
--keytool(1) tool documentation
--.TP 2
--o
--the
--.na
--\f4Security\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/security/index.html trail of the
--.na
--\f4Java Tutorial\fP @
--.fi
--http://docs.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool
--.RE
--
--.LP
--
-+'\" t
-+.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-+.\"
-+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+.\"
-+.\" This code is free software; you can redistribute it and/or modify it
-+.\" under the terms of the GNU General Public License version 2 only, as
-+.\" published by the Free Software Foundation.
-+.\"
-+.\" 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.
-+.\"
-+.\" Arch: generic
-+.\" Software: JDK 7
-+.\" Date: 6 August 2013
-+.\" SectDesc: Security Tools
-+.\" Title: jarsigner.1
-+.\"
-+.if n .pl 99999
-+.TH jarsigner 1 "6 August 2013" "JDK 7" "Security Tools"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+
-+.SH NAME
-+jarsigner \- Signs and verifies Java Archive (JAR) files\&.
-+.SH SYNOPSIS
-+.sp
-+.nf
-+
-+\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
-+.fi
-+.nf
-+
-+\fBjarsigner\fR \fB\-verify\fR [ \fIoptions\fR ] \fIjar\-file\fR [\fIalias \&.\&.\&.\fR]
-+.fi
-+.sp
-+.TP
-+\fIoptions\fR
-+The command-line options\&. See Options\&.
-+.TP
-+-verify
-+.br
-+The \f3-verify\fR option can take zero or more keystore alias names after the JAR file name\&. When the \f3-verify\fR option is specified, the \f3jarsigner\fR command checks that the certificate used to verify each signed entry in the JAR file matches one of the keystore aliases\&. The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar verified, with signer errors" is displayed\&.
-+.TP
-+\fIjar-file\fR
-+The JAR file to be signed\&.
-+
-+If you also specified the \f3-strict\fR option, and the \f3jarsigner\fR command detected severe warnings, the message, "jar signed, with signer errors" is displayed\&.
-+.TP
-+\fIalias\fR
-+The aliases are defined in the keystore specified by \f3-keystore\fR or the default keystore\&.
-+.SH DESCRIPTION
-+The \f3jarsigner\fR tool has two purposes:
-+.TP 0.2i
-+\(bu
-+To sign Java Archive (JAR) files\&.
-+.TP 0.2i
-+\(bu
-+To verify the signatures and integrity of signed JAR files\&.
-+.PP
-+The JAR feature enables the packaging of class files, images, sounds, and other digital data in a single file for faster and easier distribution\&. A tool named \f3jar\fR enables developers to produce JAR files\&. (Technically, any zip file can also be considered a JAR file, although when created by the \f3jar\fR command or processed by the \f3jarsigner\fR command, JAR files also contain a \f3META-INF/MANIFEST\&.MF\fR file\&.)
-+.PP
-+A digital signature is a string of bits that is computed from some data (the data being signed) and the private key of an entity (a person, company, and so on)\&. Similar to a handwritten signature, a digital signature has many useful characteristics:
-+.TP 0.2i
-+\(bu
-+Its authenticity can be verified by a computation that uses the public key corresponding to the private key used to generate the signature\&.
-+.TP 0.2i
-+\(bu
-+It cannot be forged, assuming the private key is kept secret\&.
-+.TP 0.2i
-+\(bu
-+It is a function of the data signed and thus cannot be claimed to be the signature for other data as well\&.
-+.TP 0.2i
-+\(bu
-+The signed data cannot be changed\&. If the data is changed, then the signature cannot be verified as authentic\&.
-+.PP
-+To generate an entity\&'s signature for a file, the entity must first have a public/private key pair associated with it and one or more certificates that authenticate its public key\&. A certificate is a digitally signed statement from one entity that says that the public key of another entity has a particular value\&.
-+.PP
-+The \f3jarsigner\fR command uses key and certificate information from a keystore to generate digital signatures for JAR files\&. A keystore is a database of private keys and their associated X\&.509 certificate chains that authenticate the corresponding public keys\&. The \f3keytool\fR command is used to create and administer keystores\&.
-+.PP
-+The \f3jarsigner\fR command uses an entity\&'s private key to generate a signature\&. The signed JAR file contains, among other things, a copy of the certificate from the keystore for the public key corresponding to the private key used to sign the file\&. The \f3jarsigner\fR command can verify the digital signature of the signed JAR file using the certificate inside it (in its signature block file)\&.
-+.PP
-+The \f3jarsigner\fR command can generate signatures that include a time stamp that lets a systems or deployer (including Java Plug-in) to check whether the JAR file was signed while the signing certificate was still valid\&. In addition, APIs allow applications to obtain the timestamp information\&.
-+.PP
-+At this time, the \f3jarsigner\fR command can only sign JAR files created by the \f3jar\fR command or zip files\&. JAR files are the same as zip files, except they also have a \f3META-INF/MANIFEST\&.MF\fR file\&. A \f3META-INF/MANIFEST\&.MF\fR file is created when the \f3jarsigner\fR command signs a zip file\&.
-+.PP
-+The default \f3jarsigner\fR command behavior is to sign a JAR or zip file\&. Use the \f3-verify\fR option to verify a signed JAR file\&.
-+.PP
-+The \f3jarsigner\fR command also attempts to validate the signer\&'s certificate after signing or verifying\&. If there is a validation error or any other problem, the command generates warning messages\&. If you specify the \f3-strict\fR option, then the command treats severe warnings as errors\&. See Errors and Warnings\&.
-+.SS KEYSTORE\ ALIASES
-+All keystore entities are accessed with unique aliases\&.
-+.PP
-+When you use the \f3jarsigner\fR command to sign a JAR file, you must specify the alias for the keystore entry that contains the private key needed to generate the signature\&. For example, the following command signs the JAR file named \f3MyJARFile\&.jar\fR with the private key associated with the alias \f3duke\fR in the keystore named \f3mystore\fR in the \f3working\fR directory\&. Because no output file is specified, it overwrites \f3MyJARFile\&.jar\fR with the signed JAR file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password> MyJARFile\&.jar duke\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Keystores are protected with a password, so the store password must be specified\&. You are prompted for it when you do not specify it on the command line\&. Similarly, private keys are protected in a keystore with a password, so the private key\&'s password must be specified, and you are prompted for the password when you do not specify it on the command line and it is not the same as the store password\&.
-+.SS KEYSTORE\ LOCATION
-+The \f3jarsigner\fR command has a \f3-keystore\fR option for specifying the URL of the keystore to be used\&. The keystore is by default stored in a file named \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+.PP
-+On Oracle Solaris systems, \f3user\&.home\fR defaults to the user\&'s home directory\&.
-+.PP
-+The input stream from the \f3-keystore\fR option is passed to the \f3KeyStore\&.load\fR method\&. If \f3NONE\fR is specified as the URL, then a null stream is passed to the \f3KeyStore\&.load\fR method\&. \f3NONE\fR should be specified when the \f3KeyStore\fR class is not file based, for example, when it resides on a hardware token device\&.
-+.SS KEYSTORE\ IMPLEMENTATION
-+The \f3KeyStore\fR class provided in the \f3java\&.security\fR package supplies a number of well-defined interfaces to access and modify the information in a keystore\&. You can have multiple different concrete implementations, where each implementation is for a particular type of keystore\&.
-+.PP
-+Currently, there are two command-line tools that use keystore implementations (\f3keytool\fR and \f3jarsigner\fR), and a GUI-based tool named Policy Tool\&. Because the \f3KeyStore\fR class is publicly available, JDK users can write additional security applications that use it\&.
-+.PP
-+There is a built-in default implementation provided by Oracle that implements the keystore as a file, that uses a proprietary keystore type (format) named JKS\&. The built-in implementation protects each private key with its individual password and protects the integrity of the entire keystore with a (possibly different) password\&.
-+.PP
-+Keystore implementations are provider-based, which means the application interfaces supplied by the \f3KeyStore\fR class are implemented in terms of a Service Provider Interface (SPI)\&. There is a corresponding abstract \f3KeystoreSpi\fR class, also in the \f3java\&.security package\fR, that defines the Service Provider Interface methods that providers must implement\&. The term provider refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API\&. To provide a keystore implementation, clients must implement a provider and supply a \f3KeystoreSpi\fR subclass implementation, as described in How to Implement a Provider in the Java Cryptography Architecture at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider\&.html
-+.PP
-+Applications can choose different types of keystore implementations from different providers, with the \f3getInstance\fR factory method in the \f3KeyStore\fR class\&. A keystore type defines the storage and data format of the keystore information and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself\&. Keystore implementations of different types are not compatible\&.
-+.PP
-+The \f3jarsigner\fR and \f3policytool\fR commands can read file-based keystores from any location that can be specified using a URL\&. In addition, these commands can read non-file-based keystores such as those provided by MSCAPI on Windows and PKCS11 on all platforms\&.
-+.PP
-+For the \f3jarsigner\fR and \f3keytool\fR commands, you can specify a keystore type at the command line with the \f3-storetype\fR option\&. For Policy Tool, you can specify a keystore type with the \fIEdit\fR command in the \fIKeyStore\fR menu\&.
-+.PP
-+If you do not explicitly specify a keystore type, then the tools choose a keystore implementation based on the value of the \f3keystore\&.type\fR property specified in the security properties file\&. The security properties file is called \f3java\&.security\fR, and it resides in the JDK security properties directory, \f3java\&.home/lib/security\fR, where \f3java\&.home\fR is the runtime environment\&'s directory\&. The \f3jre\fR directory in the JDK or the top-level directory of the Java Runtime Environment (JRE)\&.
-+.PP
-+Each tool gets the \f3keystore\&.type\fR value and then examines all the installed providers until it finds one that implements keystores of that type\&. It then uses the keystore implementation from that provider\&.
-+.PP
-+The \f3KeyStore\fR class defines a static method named \f3getDefaultType\fR that lets applications and applets retrieve the value of the \f3keystore\&.type\fR property\&. The following line of code creates an instance of the default keystore type as specified in the \f3keystore\&.type property\fR:
-+.sp
-+.nf
-+\f3KeyStore keyStore = KeyStore\&.getInstance(KeyStore\&.getDefaultType());\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+The default keystore type is \f3jks\fR (the proprietary type of the keystore implementation provided by Oracle)\&. This is specified by the following line in the security properties file:
-+.sp
-+.nf
-+\f3keystore\&.type=jks\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+Case does not matter in keystore type designations\&. For example, \f3JKS\fR is the same as \f3jks\fR\&.
-+.PP
-+To have the tools use a keystore implementation other than the default, change that line to specify a different keystore type\&. For example, if you have a provider package that supplies a keystore implementation for a keystore type called \f3pkcs12\fR, then change the line to the following:
-+.sp
-+.nf
-+\f3keystore\&.type=pkcs12\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR If you use the PKCS 11 provider package, then see "KeyTool" and "JarSigner" in Java PKCS #11 Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/p11guide\&.html
-+.SS SUPPORTED\ ALGORITHMS
-+By default, the \f3jarsigner\fR command signs a JAR file using one of the following algorithms:
-+.TP 0.2i
-+\(bu
-+Digital Signature Algorithm (DSA) with the SHA1 digest algorithm
-+.TP 0.2i
-+\(bu
-+RSA algorithm with the SHA256 digest algorithm
-+.TP 0.2i
-+\(bu
-+Elliptic Curve (EC) cryptography algorithm with the SHA256 with Elliptic Curve Digital Signature Algorithm (ECDSA)\&.
-+.PP
-+If the signer\&'s public and private keys are DSA keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA1withDSA\fR algorithm\&. If the signer\&'s keys are RSA keys, then \f3jarsigner\fR attempts to sign the JAR file with the \f3SHA256withRSA\fR algorithm\&. If the signer\&'s keys are EC keys, then \f3jarsigner\fR signs the JAR file with the \f3SHA256withECDSA\fR algorithm\&.
-+.PP
-+These default signature algorithms can be overridden using the \f3-sigalg\fR option\&.
-+.SS THE\ SIGNED\ JAR\ FILE
-+When the \f3jarsigner\fR command is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META-INF directory:
-+.TP 0.2i
-+\(bu
-+A signature file with an \f3\&.SF\fR extension
-+.TP 0.2i
-+\(bu
-+A signature block file with a \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR extension
-+.PP
-+The base file names for these two files come from the value of the \f3-sigFile\fR option\&. For example, when the option is \f3-sigFile MKSIGN\fR, the files are named \f3MKSIGN\&.SF\fR and \f3MKSIGN\&.DSA\fR
-+.PP
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to uppercase\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not allowed in a signature file name, then each such character is converted to an underscore (_) character in forming the file name\&. Valid characters include letters, digits, underscores, and hyphens\&.
-+.PP
-+Signature File
-+
-+A signature file (\f3\&.SF\fR file) looks similar to the manifest file that is always included in a JAR file when the \f3jarsigner\fR command is used to sign the file\&. For each source file included in the JAR file, the \f3\&.SF\fR file has three lines, such as in the manifest file, that list the following:
-+.TP 0.2i
-+\(bu
-+File name
-+.TP 0.2i
-+\(bu
-+Name of the digest algorithm (SHA)
-+.TP 0.2i
-+\(bu
-+SHA digest value
-+.PP
-+In the manifest file, the SHA digest value for each source file is the digest (hash) of the binary data in the source file\&. In the \f3\&.SF\fR file, the digest value for a specified source file is the hash of the three lines in the manifest file for the source file\&.
-+.PP
-+The signature file, by default, includes a header with a hash of the whole manifest file\&. The header also contains a hash of the manifest header\&. The presence of the header enables verification optimization\&. See JAR File Verification\&.
-+.PP
-+Signature Block File
-+
-+The \f3\&.SF\fR file is signed and the signature is placed in the signature block file\&. This file also contains, encoded inside it, the certificate or certificate chain from the keystore that authenticates the public key corresponding to the private key used for signing\&. The file has the extension \f3\&.DSA\fR, \f3\&.RSA\fR, or \f3\&.EC\fR, depending on the digest algorithm used\&.
-+.SS SIGNATURE\ TIME\ STAMP
-+The \f3jarsigner\fR command can generate and store a signature time stamp when signing a JAR file\&. In addition, \f3jarsigner\fR supports alternative signing mechanisms\&. This behavior is optional and is controlled by the user at the time of signing through these options\&. See Options\&.
-+.sp
-+.nf
-+\f3\-tsa \fIurl\fR\fP
-+.fi
-+.nf
-+\f3\-tsacert \fIalias\fR\fP
-+.fi
-+.nf
-+\f3\-altsigner \fIclass\fR\fP
-+.fi
-+.nf
-+\f3\-altsignerpath \fIclasspathlist\fR\fP
-+.fi
-+.nf
-+\f3\-tsapolicyid \fIpolicyid\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS JAR\ FILE\ VERIFICATION
-+A successful JAR file verification occurs when the signatures are valid, and none of the files that were in the JAR file when the signatures were generated have changed since then\&. JAR file verification involves the following steps:
-+.TP 0.4i
-+1\&.
-+Verify the signature of the \f3\&.SF\fR file\&.
-+
-+The verification ensures that the signature stored in each signature block (\f3\&.DSA\fR) file was generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the \f3\&.DSA\fR file\&. It also ensures that the signature is a valid signature of the corresponding signature (\f3\&.SF\fR) file, and thus the \f3\&.SF\fR file was not tampered with\&.
-+.TP 0.4i
-+2\&.
-+Verify the digest listed in each entry in the \f3\&.SF\fR file with each corresponding section in the manifest\&.
-+
-+The \f3\&.SF\fR file by default includes a header that contains a hash of the entire manifest file\&. When the header is present, the verification can check to see whether or not the hash in the header matches the hash of the manifest file\&. If there is a match, then verification proceeds to the next step\&.
-+
-+If there is no match, then a less optimized verification is required to ensure that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See Signature File\&.
-+
-+One reason the hash of the manifest file that is stored in the \f3\&.SF\fR file header might not equal the hash of the current manifest file is that one or more files were added to the JAR file (with the \f3jar\fR tool) after the signature and \f3\&.SF\fR file were generated\&. When the \f3jar\fR tool is used to add files, the manifest file is changed by adding sections to it for the new files, but the \f3\&.SF\fR file is not changed\&. A verification is still considered successful when none of the files that were in the JAR file when the signature was generated have been changed since then\&. This happens when the hashes in the non-header sections of the \f3\&.SF\fR file equal the hashes of the corresponding sections in the manifest file\&.
-+.TP 0.4i
-+3\&.
-+Read each file in the JAR file that has an entry in the \f3\&.SF\fR file\&. While reading, compute the file\&'s digest and compare the result with the digest for this file in the manifest section\&. The digests should be the same or verification fails\&.
-+
-+If any serious verification failures occur during the verification process, then the process is stopped and a security exception is thrown\&. The \f3jarsigner\fR command catches and displays the exception\&.
-+.PP
-+\fINote:\fR You should read any addition warnings (or errors if you specified the \f3-strict\fR option), as well as the content of the certificate (by specifying the \f3-verbose\fR and \f3-certs\fR options) to determine if the signature can be trusted\&.
-+.SS MULTIPLE\ SIGNATURES\ FOR\ A\ JAR\ FILE
-+A JAR file can be signed by multiple people by running the \f3jarsigner\fR command on the file multiple times and specifying the alias for a different person each time, as follows:
-+.sp
-+.nf
-+\f3jarsigner myBundle\&.jar susan\fP
-+.fi
-+.nf
-+\f3jarsigner myBundle\&.jar kevin\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When a JAR file is signed multiple times, there are multiple \f3\&.SF\fR and \f3\&.DSA\fR files in the resulting JAR file, one pair for each signature\&. In the previous example, the output JAR file includes files with the following names:
-+.sp
-+.nf
-+\f3SUSAN\&.SF\fP
-+.fi
-+.nf
-+\f3SUSAN\&.DSA\fP
-+.fi
-+.nf
-+\f3KEVIN\&.SF\fP
-+.fi
-+.nf
-+\f3KEVIN\&.DSA\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&.
-+.SH OPTIONS
-+The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards:
-+.TP 0.2i
-+\(bu
-+All option names are preceded by a minus sign (-)\&.
-+.TP 0.2i
-+\(bu
-+The options can be provided in any order\&.
-+.TP 0.2i
-+\(bu
-+Items that are in italics or underlined (option values) represent the actual values that must be supplied\&.
-+.TP 0.2i
-+\(bu
-+The \f3-storepass\fR, \f3-keypass\fR, \f3-sigfile\fR, \f3-sigalg\fR, \f3-digestalg\fR, \f3-signedjar\fR, and TSA-related options are only relevant when signing a JAR file; they are not relevant when verifying a signed JAR file\&. The \f3-keystore\fR option is relevant for signing and verifying a JAR file\&. In addition, aliases are specified when signing and verifying a JAR file\&.
-+.TP
-+-keystore \fIurl\fR
-+.br
-+Specifies the URL that tells the keystore location\&. This defaults to the file \f3\&.keystore\fR in the user\&'s home directory, as determined by the \f3user\&.home\fR system property\&.
-+
-+A keystore is required when signing\&. You must explicitly specify a keystore when the default keystore does not exist or if you want to use one other than the default\&.
-+
-+A keystore is not required when verifying, but if one is specified or the default exists and the \f3-verbose\fR option was also specified, then additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore\&.
-+
-+The \f3-keystore\fR argument can be a file name and path specification rather than a URL, in which case it is treated the same as a file: URL, for example, the following are equivalent:
-+.sp
-+.nf
-+\f3\-keystore \fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\-keystore file:\fIfilePathAndName\fR\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+If the Sun PKCS #11 provider was configured in the \f3java\&.security\fR security properties file (located in the JRE\&'s \f3$JAVA_HOME/lib/security directory\fR), then the \f3keytool\fR and \f3jarsigner\fR tools can operate on the PKCS #11 token by specifying these options:
-+.sp
-+.nf
-+\f3\-keystore NONE\fP
-+.fi
-+.nf
-+\f3\-storetype PKCS11\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+For example, the following command lists the contents of the configured PKCS#11 token:
-+.sp
-+.nf
-+\f3keytool \-keystore NONE \-storetype PKCS11 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-storetype \fIstoretype\fR
-+.br
-+Specifies the type of keystore to be instantiated\&. The default keystore type is the one that is specified as the value of the \f3keystore\&.type\fR property in the security properties file, which is returned by the static \f3getDefaultType\fR method in \f3java\&.security\&.KeyStore\fR\&.
-+
-+The PIN for a PCKS #11 token can also be specified with the \f3-storepass\fR option\&. If none is specified, then the \f3keytool\fR and \f3jarsigner\fR commands prompt for the token PIN\&. If the token has a protected authentication path (such as a dedicated PIN-pad or a biometric reader), then the \f3-protected\fR option must be specified and no password options can be specified\&.
-+.TP
-+-storepass[:env | :file] \fIargument\fR
-+.br
-+Specifies the password that is required to access the keystore\&. This is only needed when signing (not verifying) a JAR file\&. In that case, if a \f3-storepass\fR option is not provided at the command line, then the user is prompted for the password\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \fIargument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-keypass [:env | :file] \fIargument\fR
-+.br
-+Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line\&. The password is required when using \f3jarsigner\fR to sign a JAR file\&. If no password is provided on the command line, and the required password is different from the store password, then the user is prompted for it\&.
-+
-+If the modifier \f3env\fR or \f3file\fR is not specified, then the password has the value \f3argument\fR\&. Otherwise, the password is retrieved as follows:
-+.RS
-+.TP 0.2i
-+\(bu
-+\f3env\fR: Retrieve the password from the environment variable named \f3argument\fR\&.
-+.TP 0.2i
-+\(bu
-+\f3file\fR: Retrieve the password from the file named \f3argument\fR\&.
-+.RE
-+
-+
-+\fINote:\fR The password should not be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system\&.
-+.TP
-+-sigfile \fIfile\fR
-+.br
-+Specifies the base file name to be used for the generated \f3\&.SF\fR and \f3\&.DSA\fR files\&. For example, if file is \f3DUKESIGN\fR, then the generated \f3\&.SF\fR and \f3\&.DSA\fR files are named \f3DUKESIGN\&.SF\fR and \f3DUKESIGN\&.DSA\fR, and placed in the \f3META-INF\fR directory of the signed JAR file\&.
-+
-+The characters in the file must come from the set \f3a-zA-Z0-9_-\fR\&. Only letters, numbers, underscore, and hyphen characters are allowed\&. All lowercase characters are converted to uppercase for the \f3\&.SF\fR and \f3\&.DSA\fR file names\&.
-+
-+If no \f3-sigfile\fR option appears on the command line, then the base file name for the \f3\&.SF\fR and \f3\&.DSA\fR files is the first 8 characters of the alias name specified on the command line, all converted to upper case\&. If the alias name has fewer than 8 characters, then the full alias name is used\&. If the alias name contains any characters that are not valid in a signature file name, then each such character is converted to an underscore (_) character to form the file name\&.
-+.TP
-+-sigalg \fIalgorithm\fR
-+.br
-+Specifies the name of the signature algorithm to use to sign the JAR file\&.
-+
-+For a list of standard signature algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+This algorithm must be compatible with the private key used to sign the JAR file\&. If this option is not specified, then \f3SHA1withDSA\fR, \f3SHA256withRSA\fR, or \f3SHA256withECDSA\fR are used depending on the type of private key\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-digestalg \fIalgorithm\fR
-+.br
-+Specifies the name of the message digest algorithm to use when digesting the entries of a JAR file\&.
-+
-+For a list of standard message digest algorithm names, see "Appendix A: Standard Names" in the Java Cryptography Architecture (JCA) Reference Guide at http://docs\&.oracle\&.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec\&.html#AppA
-+
-+If this option is not specified, then \f3SHA256\fR is used\&. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f3-providerClass\fR option; otherwise, the command will not succeed\&.
-+.TP
-+-certs
-+.br
-+If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&.
-+
-+The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&.
-+.TP
-+-certchain \fIfile\fR
-+.br
-+Specifies the certificate chain to be used when the certificate chain associated with the private key of the keystore entry that is addressed by the alias specified on the command line is not complete\&. This can happen when the keystore is located on a hardware token where there is not enough capacity to hold a complete certificate chain\&. The file can be a sequence of concatenated X\&.509 certificates, or a single PKCS#7 formatted data block, either in binary encoding format or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard\&. See the section Internet RFC 1421 Certificate Encoding Standard in \f3keytool\fR and http://tools\&.ietf\&.org/html/rfc1421\&.
-+.TP
-+-verbose
-+.br
-+When the \f3-verbose\fR option appears on the command line, it indicates verbose mode, which causes \f3jarsigner\fR to output extra information about the progress of the JAR signing or verification\&.
-+.TP
-+-internalsf
-+.br
-+In the past, the \f3\&.DSA\fR (signature block) file generated when a JAR file was signed included a complete encoded copy of the \f3\&.SF\fR file (signature file) also generated\&. This behavior has been changed\&. To reduce the overall size of the output JAR file, the \f3\&.DSA\fR file by default does not contain a copy of the \f3\&.SF\fR file anymore\&. If \f3-internalsf\fR appears on the command line, then the old behavior is utilized\&. This option is useful for testing\&. In practice, do not use the \f3-internalsf\fR option because it incurs higher overhead\&.
-+.TP
-+-sectionsonly
-+.br
-+If the \f3-sectionsonly\fR option appears on the command line, then the \f3\&.SF\fR file (signature file) generated when a JAR file is signed does not include a header that contains a hash of the whole manifest file\&. It contains only the information and hashes related to each individual source file included in the JAR file\&. See Signature File\&.
-+
-+By default, this header is added, as an optimization\&. When the header is present, whenever the JAR file is verified, the verification can first check to see whether the hash in the header matches the hash of the whole manifest file\&. When there is a match, verification proceeds to the next step\&. When there is no match, it is necessary to do a less optimized verification that the hash in each source file information section in the \f3\&.SF\fR file equals the hash of its corresponding section in the manifest file\&. See JAR File Verification\&.
-+
-+The \f3-sectionsonly\fR option is primarily used for testing\&. It should not be used other than for testing because using it incurs higher overhead\&.
-+.TP
-+-protected
-+.br
-+Values can be either \f3true\fR or \f3false\fR\&. Specify \f3true\fR when a password must be specified through a protected authentication path such as a dedicated PIN reader\&.
-+.TP
-+-providerClass \fIprovider-class-name\fR
-+.br
-+Used to specify the name of cryptographic service provider\&'s master class file when the service provider is not listed in the \f3java\&.security\fR security properties file\&.
-+
-+Used with the \f3-providerArg ConfigFilePath\fR option, the \f3keytool\fR and \f3jarsigner\fR tools install the provider dynamically and use \fIConfigFilePath\fR for the path to the token configuration file\&. The following example shows a command to list a \f3PKCS #11\fR keystore when the Oracle PKCS #11 provider was not configured in the security properties file\&.
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerClass sun\&.security\&.pkcs11\&.SunPKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerArg /mydir1/mydir2/token\&.config \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-providerName \fIproviderName\fR
-+.br
-+If more than one provider was configured in the \f3java\&.security\fR security properties file, then you can use the \f3-providerName\fR option to target a specific provider instance\&. The argument to this option is the name of the provider\&.
-+
-+For the Oracle PKCS #11 provider, \fIproviderName\fR is of the form \f3SunPKCS11-\fR\fITokenName\fR, where \fITokenName\fR is the name suffix that the provider instance has been configured with, as detailed in the configuration attributes table\&. For example, the following command lists the contents of the \f3PKCS #11\fR keystore provider instance with name suffix \f3SmartCard\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore NONE \-storetype PKCS11 \e\fP
-+.fi
-+.nf
-+\f3 \-providerName SunPKCS11\-SmartCard \e\fP
-+.fi
-+.nf
-+\f3 \-list\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-J\fIjavaoption\fR
-+.br
-+Passes through the specified \fIjavaoption\fR string directly to the Java interpreter\&. The \f3jarsigner\fR command is a wrapper around the interpreter\&. This option should not contain any spaces\&. It is useful for adjusting the execution environment or memory usage\&. For a list of possible interpreter options, type \f3java -h\fR or \f3java -X\fR at the command line\&.
-+.TP
-+-tsa \fIurl\fR
-+.br
-+If \f3-tsa http://example\&.tsa\&.url\fR appears on the command line when signing a JAR file then a time stamp is generated for the signature\&. The URL, \f3http://example\&.tsa\&.url\fR, identifies the location of the Time Stamping Authority (TSA) and overrides any URL found with the \f3-tsacert\fR option\&. The \f3-tsa\fR option does not require the TSA public key certificate to be present in the keystore\&.
-+
-+To generate the time stamp, \f3jarsigner\fR communicates with the TSA with the Time-Stamp Protocol (TSP) defined in RFC 3161\&. When successful, the time stamp token returned by the TSA is stored with the signature in the signature block file\&.
-+.TP
-+-tsacert \fIalias\fR
-+.br
-+When \f3-tsacert alias\fR appears on the command line when signing a JAR file, a time stamp is generated for the signature\&. The alias identifies the TSA public key certificate in the keystore that is in effect\&. The entry\&'s certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA\&.
-+
-+The TSA public key certificate must be present in the keystore when using the \f3-tsacert\fR option\&.
-+.TP
-+-tsapolicyid \fIpolicyid\fR
-+.br
-+Specifies the object identifier (OID) that identifies the policy ID to be sent to the TSA server\&. If this option is not specified, no policy ID is sent and the TSA server will choose a default policy ID\&.
-+
-+Object identifiers are defined by X\&.696, which is an ITU Telecommunication Standardization Sector (ITU-T) standard\&. These identifiers are typically period-separated sets of non-negative digits like \f31\&.2\&.3\&.4\fR, for example\&.
-+.TP
-+-altsigner \fIclass\fR
-+.br
-+This option specifies an alternative signing mechanism\&. The fully qualified class name identifies a class file that extends the \f3com\&.sun\&.jarsigner\&.ContentSigner\fR abstract class\&. The path to this class file is defined by the \f3-altsignerpath\fR option\&. If the \f3-altsigner\fR option is used, then the \f3jarsigner\fR command uses the signing mechanism provided by the specified class\&. Otherwise, the \f3jarsigner\fR command uses its default signing mechanism\&.
-+
-+For example, to use the signing mechanism provided by a class named \f3com\&.sun\&.sun\&.jarsigner\&.AuthSigner\fR, use the jarsigner option \f3-altsigner com\&.sun\&.jarsigner\&.AuthSigner\fR\&.
-+.TP
-+-altsignerpath \fIclasspathlist\fR
-+.br
-+Specifies the path to the class file and any JAR file it depends on\&. The class file name is specified with the \f3-altsigner\fR option\&. If the class file is in a JAR file, then this option specifies the path to that JAR file\&.
-+
-+An absolute path or a path relative to the current directory can be specified\&. If \fIclasspathlist\fR contains multiple paths or JAR files, then they should be separated with a colon (:) on Oracle Solaris and a semicolon (;) on Windows\&. This option is not necessary when the class is already in the search path\&.
-+
-+The following example shows how to specify the path to a JAR file that contains the class file\&. The JAR file name is included\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/lib/authsigner\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+
-+The following example shows how to specify the path to the JAR file that contains the class file\&. The JAR file name is omitted\&.
-+.sp
-+.nf
-+\f3\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+
-+.TP
-+-strict
-+.br
-+During the signing or verifying process, the command may issue warning messages\&. If you specify this option, the exit code of the tool reflects the severe warning messages that this command found\&. See Errors and Warnings\&.
-+.TP
-+-verbose \fIsuboptions\fR
-+.br
-+For the verifying process, the \f3-verbose\fR option takes suboptions to determine how much information is shown\&. If the \f3-certs\fR option is also specified, then the default mode (or suboption \f3all\fR) displays each entry as it is being processed, and after that, the certificate information for each signer of the JAR file\&. If the \f3-certs\fR and the \f3-verbose:grouped\fR suboptions are specified, then entries with the same signer info are grouped and displayed together with their certificate information\&. If \f3-certs\fR and the \f3-verbose:summary\fR suboptions are specified, then entries with the same signer information are grouped and displayed together with their certificate information\&. Details about each entry are summarized and displayed as \fIone entry (and more)\fR\&. See Examples\&.
-+.SH ERRORS\ AND\ WARNINGS
-+During the signing or verifying process, the \f3jarsigner\fR command may issue various errors or warnings\&.
-+.PP
-+If there is a failure, the \f3jarsigner\fR command exits with code 1\&. If there is no failure, but there are one or more severe warnings, the \f3jarsigner\fR command exits with code 0 when the \f3-strict\fR option is \fInot\fR specified, or exits with the OR-value of the warning codes when the \f3-strict\fR is specified\&. If there is only informational warnings or no warning at all, the command always exits with code 0\&.
-+.PP
-+For example, if a certificate used to sign an entry is expired and has a KeyUsage extension that does not allow it to sign a file, the \f3jarsigner\fR command exits with code 12 (=4+8) when the \f3-strict\fR option is specified\&.
-+.PP
-+\fINote:\fR Exit codes are reused because only the values from 0 to 255 are legal on Unix-based operating systems\&.
-+.PP
-+The following sections describes the names, codes, and descriptions of the errors and warnings that the \f3jarsigner\fR command can issue\&.
-+.SS FAILURE
-+Reasons why the \f3jarsigner\fR command fails include (but are not limited to) a command line parsing error, the inability to find a keypair to sign the JAR file, or the verification of a signed JAR fails\&.
-+.TP
-+failure
-+Code 1\&. The signing or verifying fails\&.
-+.SS SEVERE\ WARNINGS
-+\fINote:\fR Severe warnings are reported as errors if you specify the \f3-strict\fR option\&.
-+.PP
-+Reasons why the \f3jarsigner\fR command issues a severe warning include the certificate used to sign the JAR file has an error or the signed JAR file has other problems\&.
-+.TP
-+hasExpiredCert
-+Code 4\&. This jar contains entries whose signer certificate has expired\&.
-+.TP
-+notYetValidCert
-+Code 4\&. This jar contains entries whose signer certificate is not yet valid\&.
-+.TP
-+chainNotValidated
-+Code 4\&. This jar contains entries whose certificate chain cannot be correctly validated\&.
-+.TP
-+badKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s KeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badExtendedKeyUsage
-+Code 8\&. This jar contains entries whose signer certificate\&'s ExtendedKeyUsage extension doesn\&'t allow code signing\&.
-+.TP
-+badNetscapeCertType
-+Code 8\&. This jar contains entries whose signer certificate\&'s NetscapeCertType extension doesn\&'t allow code signing\&.
-+.TP
-+hasUnsignedEntry
-+Code 16\&. This jar contains unsigned entries which have not been integrity-checked\&.
-+.TP
-+notSignedByAlias
-+Code 32\&. This jar contains signed entries which are not signed by the specified alias(es)\&.
-+.TP
-+aliasNotInStore
-+Code 32\&. This jar contains signed entries that are not signed by alias in this keystore\&.
-+.SS INFORMATIONAL\ WARNINGS
-+Informational warnings include those that are not errors but regarded as bad practice\&. They do not have a code\&.
-+.TP
-+hasExpiringCert
-+This jar contains entries whose signer certificate will expire within six months\&.
-+.TP
-+noTimestamp
-+This jar contains signatures that does not include a timestamp\&. Without a timestamp, users may not be able to validate this JAR file after the signer certificate\&'s expiration date (\f3YYYY-MM-DD\fR) or after any future revocation date\&.
-+.SH EXAMPLES
-+.SS SIGN\ A\ JAR\ FILE
-+Use the following command to sign bundle\&.jar with the private key of a user whose keystore alias is \f3jane\fR in a keystore named \f3mystore\fR in the \f3working\fR directory and name the signed JAR file \f3sbundle\&.jar\fR:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-storepass <keystore password>\fP
-+.fi
-+.nf
-+\f3 \-keypass <private key password>\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+There is no \f3-sigfile\fR specified in the previous command so the generated \f3\&.SF\fR and \f3\&.DSA\fR files to be placed in the signed JAR file have default names based on the alias name\&. They are named \f3JANE\&.SF\fR and \f3JANE\&.DSA\fR\&.
-+.PP
-+If you want to be prompted for the store password and the private key password, then you could shorten the previous command to the following:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore\fP
-+.fi
-+.nf
-+\f3 \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the keystore is the default keystore (\&.keystore in your home directory), then you do not need to specify a keystore, as follows:
-+.sp
-+.nf
-+\f3jarsigner \-signedjar sbundle\&.jar bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If you want the signed JAR file to overwrite the input JAR file (bundle\&.jar), then you do not need to specify a \f3-signedjar\fR option, as follows:
-+.sp
-+.nf
-+\f3jarsigner bundle\&.jar jane\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFY\ A\ SIGNED\ JAR\ FILE
-+To verify a signed JAR file to ensure that the signature is valid and the JAR file was not been tampered with, use a command such as the following:
-+.sp
-+.nf
-+\f3jarsigner \-verify sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+When the verification is successful, \f3jar verified\fR is displayed\&. Otherwise, an error message is displayed\&. You can get more information when you use the \f3-verbose\fR option\&. A sample use of \f3jarsigner\fR with the\f3-verbose\fR option follows:
-+.sp
-+.nf
-+\f3jarsigner \-verify \-verbose sbundle\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 AclEx\&.class\fP
-+.fi
-+.nf
-+\f3 smk 849 Fri Sep 26 16:12:46 PDT 1997 test\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+.SS VERIFICATION\ WITH\ CERTIFICATE\ INFORMATION
-+If you specify the \f3-certs\fR option with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. The information includes the certificate type, the signer distinguished name information (when it is an X\&.509 certificate), and in parentheses, the keystore alias for the signer when the public key certificate in the JAR file matches the one in a keystore entry, for example:
-+.sp
-+.nf
-+\f3jarsigner \-keystore /working/mystore \-verify \-verbose \-certs myTest\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 208 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.SF\fP
-+.fi
-+.nf
-+\f3 1087 Fri Sep 26 16:23:30 PDT 1997 META\-INF/JAVATEST\&.DSA\fP
-+.fi
-+.nf
-+\f3 smk 2752 Fri Sep 26 16:12:30 PDT 1997 Tst\&.class\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Test Group, OU=Java Software, O=Oracle, L=CUP, S=CA, C=US (javatest)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&.
-+.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS
-+If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&.
-+.PP
-+When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example:
-+.sp
-+.nf
-+\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP
-+.fi
-+.nf
-+\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP
-+.fi
-+.nf
-+\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP
-+.fi
-+.nf
-+\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP
-+.fi
-+.nf
-+\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 s = signature was verified\fP
-+.fi
-+.nf
-+\f3 m = entry is listed in manifest\fP
-+.fi
-+.nf
-+\f3 k = at least one certificate was found in keystore\fP
-+.fi
-+.nf
-+\f3 i = at least one certificate was found in identity scope\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.nf
-+\f3 jar verified\&.\fP
-+.fi
-+.nf
-+\f3\fR
-+.fi
-+.sp
-+\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&.
-+.SH JDK\ 1\&.1\ COMPATIBILITY
-+The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&.
-+.PP
-+The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following:
-+.TP 0.2i
-+\(bu
-+It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&.
-+.TP 0.2i
-+\(bu
-+The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&.
-+.SS UNSIGNED\ JARS
-+Unsigned JARs have the default privileges that are granted to all code\&.
-+.SS SIGNED\ JARS
-+Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&.
-+.PP
-+Default Privileges Granted to All Code
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: Yes/Untrusted
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 and 3 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Default Privileges and Policy File Privileges Granted
-+
-+Identity in 1\&.1 database: \fINo\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 2 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+All Privileges Granted
-+
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.PP
-+
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR
-+.br
-+Policy file grants privileges to identity/alias: \fINo\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Identity in 1\&.1 database: \fIYes/Trusted\fR
-+.br
-+Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR
-+.br
-+Policy file grants privileges to identity/alias: \fIYes\fR
-+.br
-+See 1 in Notes Regarding Privileges of Signed JARs\&.
-+.PP
-+Notes Regarding Privileges of Signed JARs
-+.TP 0.4i
-+1\&.
-+If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&.
-+.TP 0.4i
-+2\&.
-+The policy file/keystore combination has precedence over a trusted identity in the identity database\&.
-+.TP 0.4i
-+3\&.
-+Untrusted identities are ignored in the Java platform\&.
-+.SH SEE\ ALSO
-+.TP 0.2i
-+\(bu
-+\f3jar\fR
-+.TP 0.2i
-+\(bu
-+\f3keytool\fR
-+.TP 0.2i
-+\(bu
-+Trail: Security Features in Java SE at http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html
-+.RE
-+.br
-+'pl 8.5i
-+'bp
+--- jdk/src/solaris/demo/jni/Poller/Poller.c 2013-09-06 11:29:09.000000000 -0700
++++ jdk/src/solaris/demo/jni/Poller/Poller.c 2014-04-20 12:39:22.000000000 -0700
+@@ -318,7 +318,7 @@
+
+ ioevent_t *ioeh;
+
+- if (handle < 0 || handle > MAX_HANDLES)
++ if (handle < 0 || handle >= MAX_HANDLES)
+ {
+ STATE_EXCEPTION("DestroyPoller - handle out of range");
+ return;
+@@ -366,7 +366,7 @@
+ int retval;
+ ioevent_t *ioeh;
+
+- if (handle < 0 || handle > MAX_HANDLES)
++ if (handle < 0 || handle >= MAX_HANDLES)
+ return STATE_EXCEPTION("AddFd - handle out of range");
+
+ ioeh = &IOE_handles[handle];
+@@ -459,7 +459,7 @@
+ return fd;
+ }
+
+- /*
++/*
+ * Class: Poller
+ * Method: nativeRemoveFd
+ * Signature: (II)I
+@@ -469,7 +469,7 @@
+ {
+ ioevent_t *ioeh;
+
+- if (handle < 0 || handle > MAX_HANDLES)
++ if (handle < 0 || handle >= MAX_HANDLES)
+ return STATE_EXCEPTION("RemoveFd - handle out of range");
+
+ ioeh = &IOE_handles[handle];
+@@ -576,7 +576,7 @@
+ int i;
+ ioevent_t *ioeh;
+
+- if (handle < 0 || handle > MAX_HANDLES)
++ if (handle < 0 || handle >= MAX_HANDLES)
+ return STATE_EXCEPTION("IsMember - handle out of range");
+
+ ioeh = &IOE_handles[handle];
+@@ -629,7 +629,7 @@
+ ioevent_t *ioeh;
+ jboolean isCopy1,isCopy2;
+
+- if (handle < 0 || handle > MAX_HANDLES)
++ if (handle < 0 || handle >= MAX_HANDLES)
+ return STATE_EXCEPTION("nativeWait - handle out of range");
+
+ ioeh = &IOE_handles[handle];
--- jdk/src/solaris/javavm/export/jvm_md.h 2013-09-06 11:29:09.000000000 -0700
-+++ jdk/src/solaris/javavm/export/jvm_md.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/javavm/export/jvm_md.h 2014-04-20 12:39:22.000000000 -0700
@@ -75,7 +75,11 @@
#define JVM_O_O_APPEND O_APPEND
#define JVM_O_EXCL O_EXCL
@@ -69439,7 +56833,7 @@
/* Signals */
--- jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2013-09-06 11:29:09.000000000 -0700
-+++ jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -168,6 +168,9 @@
/*
* XXXBSD: there's no way available to get swap info in
@@ -69489,8 +56883,19 @@
*/
// throw_internal_error(env, "Unimplemented in FreeBSD");
return (100);
+--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c 2013-09-06 11:29:10.000000000 -0700
++++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c 2014-04-20 12:39:22.000000000 -0700
+@@ -76,7 +76,7 @@
+ adPath[*count].st_ino = statBuf.st_ino;
+ adPath[*count].st_dev = statBuf.st_dev;
+ strncpy(adPath[*count].path, path, MAX_NAME_LENGTH);
+- adPath[*count].path[MAX_NAME_LENGTH] = 0;
++ adPath[*count].path[MAX_NAME_LENGTH - 1] = 0;
+ (*count)++;
+ TRACE1("Added audio device %s\n", path);
+ }
--- jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -151,7 +151,6 @@
return rv;
}
@@ -69500,8 +56905,43 @@
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
--- jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2014-01-18 12:16:33.000000000 -0800
-@@ -53,7 +53,7 @@
++++ jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2014-04-20 12:39:22.000000000 -0700
+@@ -31,21 +31,24 @@
+ #ifdef __APPLE__
+ #include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
++#else
++/* This is one of the rare times it's more portable to declare an
++ * external symbol explicitly, rather than via a system header.
++ * The declaration is standardized as part of UNIX98, but there is
++ * no standard (not even de-facto) header file where the
++ * declaration is to be found. See:
++ * http://www.opengroup.org/onlinepubs/009695399/functions/environ.html
++ * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_02.html
++ *
++ * "All identifiers in this volume of IEEE Std 1003.1-2001, except
++ * environ, are defined in at least one of the headers" (!)
++ */
++extern char **environ;
+ #endif
+
+ JNIEXPORT jobjectArray JNICALL
+ Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, jclass ign)
+ {
+- /* This is one of the rare times it's more portable to declare an
+- * external symbol explicitly, rather than via a system header.
+- * The declaration is standardized as part of UNIX98, but there is
+- * no standard (not even de-facto) header file where the
+- * declaration is to be found. See:
+- * http://www.opengroup.org/onlinepubs/007908799/xbd/envvar.html */
+-#ifndef __APPLE__
+- extern char ** environ; /* environ[i] looks like: VAR=VALUE\0 */
+-#endif
+-
+ jsize count = 0;
+ jsize i, j;
+ jobjectArray result;
+@@ -53,7 +56,7 @@
for (i = 0; environ[i]; i++) {
/* Ignore corrupted environment variables */
@@ -69510,7 +56950,7 @@
count++;
}
-@@ -63,7 +63,7 @@
+@@ -63,7 +66,7 @@
for (i = 0, j = 0; environ[i]; i++) {
const char * varEnd = strchr(environ[i], '=');
/* Ignore corrupted environment variables */
@@ -69520,36 +56960,1479 @@
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
--- jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-01-18 12:16:33.000000000 -0800
-@@ -394,7 +394,17 @@
- return c >= '0' && c <= '9';
++++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-04-20 12:39:22.000000000 -0700
+@@ -47,19 +47,15 @@
+ #endif
+ #include <signal.h>
+ #include <string.h>
+-#include <errno.h>
+-#include <dirent.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-#include <limits.h>
+-
+-#ifdef __APPLE__
+-#include <crt_externs.h>
+-#define environ (*_NSGetEnviron())
++
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
++#include <spawn.h>
+ #endif
+
++#include "childproc.h"
++
+ /*
+- * There are 3 possible strategies we might use to "fork":
++ * There are 4 possible strategies we might use to "fork":
+ *
+ * - fork(2). Very portable and reliable but subject to
+ * failure due to overcommit (see the documentation on
+@@ -94,80 +90,20 @@
+ * http://sources.redhat.com/bugzilla/show_bug.cgi?id=10311
+ * but the glibc maintainers closed it as WONTFIX.
+ *
+- * Based on the above analysis, we are currently using vfork() on
+- * Linux and fork() on other Unix systems, but the code to use clone()
+- * remains.
+- */
+-
+-#define START_CHILD_USE_CLONE 0 /* clone() currently disabled; see above. */
+-
+-#ifndef START_CHILD_USE_CLONE
+- #ifdef __linux__
+- #define START_CHILD_USE_CLONE 1
+- #else
+- #define START_CHILD_USE_CLONE 0
+- #endif
+-#endif
+-
+-/* By default, use vfork() on Linux. */
+-#ifndef START_CHILD_USE_VFORK
+- #ifdef __linux__
+- #define START_CHILD_USE_VFORK 1
+- #else
+- #define START_CHILD_USE_VFORK 0
+- #endif
+-#endif
+-
+-#if START_CHILD_USE_CLONE
+-#include <sched.h>
+-#define START_CHILD_SYSTEM_CALL "clone"
+-#elif START_CHILD_USE_VFORK
+-#define START_CHILD_SYSTEM_CALL "vfork"
+-#else
+-#define START_CHILD_SYSTEM_CALL "fork"
+-#endif
+-
+-#ifndef STDIN_FILENO
+-#define STDIN_FILENO 0
+-#endif
+-
+-#ifndef STDOUT_FILENO
+-#define STDOUT_FILENO 1
+-#endif
+-
+-#ifndef STDERR_FILENO
+-#define STDERR_FILENO 2
+-#endif
+-
+-#ifndef SA_NOCLDSTOP
+-#define SA_NOCLDSTOP 0
+-#endif
+-
+-#ifndef SA_RESTART
+-#define SA_RESTART 0
+-#endif
+-
+-#define FAIL_FILENO (STDERR_FILENO + 1)
+-
+-/* TODO: Refactor. */
+-#define RESTARTABLE(_cmd, _result) do { \
+- do { \
+- _result = _cmd; \
+- } while((_result == -1) && (errno == EINTR)); \
+-} while(0)
+-
+-/* This is one of the rare times it's more portable to declare an
+- * external symbol explicitly, rather than via a system header.
+- * The declaration is standardized as part of UNIX98, but there is
+- * no standard (not even de-facto) header file where the
+- * declaration is to be found. See:
+- * http://www.opengroup.org/onlinepubs/009695399/functions/environ.html
+- * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_02.html
++ * - posix_spawn(). While posix_spawn() is a fairly elaborate and
++ * complicated system call, it can't quite do everything that the old
++ * fork()/exec() combination can do, so the only feasible way to do
++ * this, is to use posix_spawn to launch a new helper executable
++ * "jprochelper", which in turn execs the target (after cleaning
++ * up file-descriptors etc.) The end result is the same as before,
++ * a child process linked to the parent in the same way, but it
++ * avoids the problem of duplicating the parent (VM) process
++ * address space temporarily, before launching the target command.
+ *
+- * "All identifiers in this volume of IEEE Std 1003.1-2001, except
+- * environ, are defined in at least one of the headers" (!)
++ * Based on the above analysis, we are currently using vfork() on
++ * Linux, posix_spawn() on Mac and fork() on Solaris, but the code to
++ * use clone() and fork() remains.
+ */
+-extern char **environ;
+
+
+ static void
+@@ -245,53 +181,35 @@
+ }
+
+ static const char * const *
+-splitPath(JNIEnv *env, const char *path)
++effectivePathv(JNIEnv *env)
+ {
+- const char *p, *q;
+- char **pathv;
++ char *p;
+ int i;
++ const char *path = effectivePath();
+ int count = countOccurrences(path, ':') + 1;
+-
+- pathv = NEW(char*, count+1);
+- pathv[count] = NULL;
+- for (p = path, i = 0; i < count; i++, p = q + 1) {
+- for (q = p; (*q != ':') && (*q != '\0'); q++)
+- ;
+- if (q == p) /* empty PATH component => "." */
+- pathv[i] = "./";
+- else {
+- int addSlash = ((*(q - 1)) != '/');
+- pathv[i] = NEW(char, q - p + addSlash + 1);
+- memcpy(pathv[i], p, q - p);
+- if (addSlash)
+- pathv[i][q - p] = '/';
+- pathv[i][q - p + addSlash] = '\0';
+- }
++ size_t pathvsize = sizeof(const char *) * (count+1);
++ size_t pathsize = strlen(path) + 1;
++ const char **pathv = (const char **) xmalloc(env, pathvsize + pathsize);
++
++ if (pathv == NULL)
++ return NULL;
++ p = (char *) pathv + pathvsize;
++ memcpy(p, path, pathsize);
++ /* split PATH by replacing ':' with NULs; empty components => "." */
++ for (i = 0; i < count; i++) {
++ char *q = p + strcspn(p, ":");
++ pathv[i] = (p == q) ? "." : p;
++ *q = '\0';
++ p = q + 1;
+ }
+- return (const char * const *) pathv;
++ pathv[count] = NULL;
++ return pathv;
+ }
+
+-/**
+- * Cached value of JVM's effective PATH.
+- * (We don't support putenv("PATH=...") in native code)
+- */
+-static const char *parentPath;
+-
+-/**
+- * Split, canonicalized version of parentPath
+- */
+-static const char * const *parentPathv;
+-
+-static jfieldID field_exitcode;
+-
+ JNIEXPORT void JNICALL
+-Java_java_lang_UNIXProcess_initIDs(JNIEnv *env, jclass clazz)
++Java_java_lang_UNIXProcess_init(JNIEnv *env, jclass clazz)
+ {
+- field_exitcode = (*env)->GetFieldID(env, clazz, "exitcode", "I");
+-
+- parentPath = effectivePath();
+- parentPathv = splitPath(env, parentPath);
+-
++ parentPathv = effectivePathv(env);
+ setSIGCHLDHandler(env);
+ }
+
+@@ -358,96 +276,6 @@
+ }
}
+-static ssize_t
+-restartableWrite(int fd, const void *buf, size_t count)
+-{
+- ssize_t result;
+- RESTARTABLE(write(fd, buf, count), result);
+- return result;
+-}
+-
+-static int
+-restartableDup2(int fd_from, int fd_to)
+-{
+- int err;
+- RESTARTABLE(dup2(fd_from, fd_to), err);
+- return err;
+-}
+-
+-static int
+-restartableClose(int fd)
+-{
+- int err;
+- RESTARTABLE(close(fd), err);
+- return err;
+-}
+-
+-static int
+-closeSafely(int fd)
+-{
+- return (fd == -1) ? 0 : restartableClose(fd);
+-}
+-
+-static int
+-isAsciiDigit(char c)
+-{
+- return c >= '0' && c <= '9';
+-}
+-
-#ifdef _ALLBSD_SOURCE
+-#define FD_DIR "/dev/fd"
+-#define dirent64 dirent
+-#define readdir64 readdir
+-#else
+-#define FD_DIR "/proc/self/fd"
+-#endif
+-
+-static int
+-closeDescriptors(void)
+-{
+- DIR *dp;
+- struct dirent64 *dirp;
+- int from_fd = FAIL_FILENO + 1;
+-
+- /* We're trying to close all file descriptors, but opendir() might
+- * itself be implemented using a file descriptor, and we certainly
+- * don't want to close that while it's in use. We assume that if
+- * opendir() is implemented using a file descriptor, then it uses
+- * the lowest numbered file descriptor, just like open(). So we
+- * close a couple explicitly. */
+-
+- restartableClose(from_fd); /* for possible use by opendir() */
+- restartableClose(from_fd + 1); /* another one for good luck */
+-
+- if ((dp = opendir(FD_DIR)) == NULL)
+- return 0;
+-
+- /* We use readdir64 instead of readdir to work around Solaris bug
+- * 6395699: /proc/self/fd fails to report file descriptors >= 1024 on Solaris 9
+- */
+- while ((dirp = readdir64(dp)) != NULL) {
+- int fd;
+- if (isAsciiDigit(dirp->d_name[0]) &&
+- (fd = strtol(dirp->d_name, NULL, 10)) >= from_fd + 2)
+- restartableClose(fd);
+- }
+-
+- closedir(dp);
+-
+- return 1;
+-}
+-
+-static int
+-moveDescriptor(int fd_from, int fd_to)
+-{
+- if (fd_from != fd_to) {
+- if ((restartableDup2(fd_from, fd_to) == -1) ||
+- (restartableClose(fd_from) == -1))
+- return -1;
+- }
+- return 0;
+-}
+-
+ static const char *
+ getBytes(JNIEnv *env, jbyteArray arr)
+ {
+@@ -463,19 +291,6 @@
+ }
+
+ static void
+-initVectorFromBlock(const char**vector, const char* block, int count)
+-{
+- int i;
+- const char *p;
+- for (i = 0, p = block; i < count; i++) {
+- /* Invariant: p always points to the start of a C string. */
+- vector[i] = p;
+- while (*(p++));
+- }
+- vector[count] = NULL;
+-}
+-
+-static void
+ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail)
+ {
+ static const char * const format = "error=%d, %s";
+@@ -490,6 +305,9 @@
+ }
+ /* ASCII Decimal representation uses 2.4 times as many bits as binary. */
+ errmsg = NEW(char, strlen(format) + strlen(detail) + 3 * sizeof(errnum));
++ if (errmsg == NULL)
++ return;
++
+ sprintf(errmsg, format, errnum, detail);
+ s = JNU_NewStringPlatform(env, errmsg);
+ if (s != NULL) {
+@@ -515,278 +333,74 @@
+ }
+ #endif /* DEBUG_PROCESS */
+
+-/**
+- * Exec FILE as a traditional Bourne shell script (i.e. one without #!).
+- * If we could do it over again, we would probably not support such an ancient
+- * misfeature, but compatibility wins over sanity. The original support for
+- * this was imported accidentally from execvp().
+- */
+ static void
+-execve_as_traditional_shell_script(const char *file,
+- const char *argv[],
+- const char *const envp[])
+-{
+- /* Use the extra word of space provided for us in argv by caller. */
+- const char *argv0 = argv[0];
+- const char *const *end = argv;
+- while (*end != NULL)
+- ++end;
+- memmove(argv+2, argv+1, (end-argv) * sizeof (*end));
+- argv[0] = "/bin/sh";
+- argv[1] = file;
+- execve(argv[0], (char **) argv, (char **) envp);
+- /* Can't even exec /bin/sh? Big trouble, but let's soldier on... */
+- memmove(argv+1, argv+2, (end-argv) * sizeof (*end));
+- argv[0] = argv0;
+-}
+-
+-/**
+- * Like execve(2), except that in case of ENOEXEC, FILE is assumed to
+- * be a shell script and the system default shell is invoked to run it.
+- */
+-static void
+-execve_with_shell_fallback(const char *file,
+- const char *argv[],
+- const char *const envp[])
+-{
+-#if START_CHILD_USE_CLONE || START_CHILD_USE_VFORK
+- /* shared address space; be very careful. */
+- execve(file, (char **) argv, (char **) envp);
+- if (errno == ENOEXEC)
+- execve_as_traditional_shell_script(file, argv, envp);
+-#else
+- /* unshared address space; we can mutate environ. */
+- environ = (char **) envp;
+- execvp(file, (char **) argv);
+-#endif
++copyPipe(int from[2], int to[2])
++{
++ to[0] = from[0];
++ to[1] = from[1];
+ }
+
+-/**
+- * 'execvpe' should have been included in the Unix standards,
+- * and is a GNU extension in glibc 2.10.
++/* arg is an array of pointers to 0 terminated strings. array is terminated
++ * by a null element.
+ *
+- * JDK_execvpe is identical to execvp, except that the child environment is
+- * specified via the 3rd argument instead of being inherited from environ.
+- */
+-static void
+-JDK_execvpe(const char *file,
+- const char *argv[],
+- const char *const envp[])
+-{
+- if (envp == NULL || (char **) envp == environ) {
+- execvp(file, (char **) argv);
++ * *nelems and *nbytes receive the number of elements of array (incl 0)
++ * and total number of bytes (incl. 0)
++ * Note. An empty array will have one null element
++ * But if arg is null, then *nelems set to 0, and *nbytes to 0
++ */
++static void arraysize(const char * const *arg, int *nelems, int *nbytes)
++{
++ int i, bytes, count;
++ const char * const *a = arg;
++ char *p;
++ int *q;
++ if (arg == 0) {
++ *nelems = 0;
++ *nbytes = 0;
+ return;
+ }
+-
+- if (*file == '\0') {
+- errno = ENOENT;
+- return;
+- }
+-
+- if (strchr(file, '/') != NULL) {
+- execve_with_shell_fallback(file, argv, envp);
+- } else {
+- /* We must search PATH (parent's, not child's) */
+- char expanded_file[PATH_MAX];
+- int filelen = strlen(file);
+- int sticky_errno = 0;
+- const char * const * dirs;
+- for (dirs = parentPathv; *dirs; dirs++) {
+- const char * dir = *dirs;
+- int dirlen = strlen(dir);
+- if (filelen + dirlen + 1 >= PATH_MAX) {
+- errno = ENAMETOOLONG;
+- continue;
+- }
+- memcpy(expanded_file, dir, dirlen);
+- memcpy(expanded_file + dirlen, file, filelen);
+- expanded_file[dirlen + filelen] = '\0';
+- execve_with_shell_fallback(expanded_file, argv, envp);
+- /* There are 3 responses to various classes of errno:
+- * return immediately, continue (especially for ENOENT),
+- * or continue with "sticky" errno.
+- *
+- * From exec(3):
+- *
+- * If permission is denied for a file (the attempted
+- * execve returned EACCES), these functions will continue
+- * searching the rest of the search path. If no other
+- * file is found, however, they will return with the
+- * global variable errno set to EACCES.
+- */
+- switch (errno) {
+- case EACCES:
+- sticky_errno = errno;
+- /* FALLTHRU */
+- case ENOENT:
+- case ENOTDIR:
+-#ifdef ELOOP
+- case ELOOP:
+-#endif
+-#ifdef ESTALE
+- case ESTALE:
+-#endif
+-#ifdef ENODEV
+- case ENODEV:
+-#endif
+-#ifdef ETIMEDOUT
+- case ETIMEDOUT:
+-#endif
+- break; /* Try other directories in PATH */
+- default:
+- return;
+- }
+- }
+- if (sticky_errno != 0)
+- errno = sticky_errno;
++ /* count the array elements and number of bytes */
++ for (count=0, bytes=0; *a != 0; count++, a++) {
++ bytes += strlen(*a)+1;
+ }
++ *nbytes = bytes;
++ *nelems = count+1;
+ }
+
+-/*
+- * Reads nbyte bytes from file descriptor fd into buf,
+- * The read operation is retried in case of EINTR or partial reads.
+- *
+- * Returns number of bytes read (normally nbyte, but may be less in
+- * case of EOF). In case of read errors, returns -1 and sets errno.
++/* copy the strings from arg[] into buf, starting at given offset
++ * return new offset to next free byte
+ */
+-static ssize_t
+-readFully(int fd, void *buf, size_t nbyte)
+-{
+- ssize_t remaining = nbyte;
+- for (;;) {
+- ssize_t n = read(fd, buf, remaining);
+- if (n == 0) {
+- return nbyte - remaining;
+- } else if (n > 0) {
+- remaining -= n;
+- if (remaining <= 0)
+- return nbyte;
+- /* We were interrupted in the middle of reading the bytes.
+- * Unlikely, but possible. */
+- buf = (void *) (((char *)buf) + n);
+- } else if (errno == EINTR) {
+- /* Strange signals like SIGJVM1 are possible at any time.
+- * See http://www.dreamsongs.com/WorseIsBetter.html */
+- } else {
+- return -1;
+- }
+- }
+-}
+-
+-typedef struct _ChildStuff
+-{
+- int in[2];
+- int out[2];
+- int err[2];
+- int fail[2];
+- int fds[3];
+- const char **argv;
+- const char **envv;
+- const char *pdir;
+- jboolean redirectErrorStream;
+-#if START_CHILD_USE_CLONE
+- void *clone_stack;
+-#endif
+-} ChildStuff;
++static int copystrings(char *buf, int offset, const char * const *arg) {
++ char *p;
++ const char * const *a;
++ int count=0;
+
+-static void
+-copyPipe(int from[2], int to[2])
+-{
+- to[0] = from[0];
+- to[1] = from[1];
+-}
+-
+-/**
+- * Child process after a successful fork() or clone().
+- * This function must not return, and must be prepared for either all
+- * of its address space to be shared with its parent, or to be a copy.
+- * It must not modify global variables such as "environ".
+- */
+-static int
+-childProcess(void *arg)
+-{
+- const ChildStuff* p = (const ChildStuff*) arg;
+-
+- /* Close the parent sides of the pipes.
+- Closing pipe fds here is redundant, since closeDescriptors()
+- would do it anyways, but a little paranoia is a good thing. */
+- if ((closeSafely(p->in[1]) == -1) ||
+- (closeSafely(p->out[0]) == -1) ||
+- (closeSafely(p->err[0]) == -1) ||
+- (closeSafely(p->fail[0]) == -1))
+- goto WhyCantJohnnyExec;
+-
+- /* Give the child sides of the pipes the right fileno's. */
+- /* Note: it is possible for in[0] == 0 */
+- if ((moveDescriptor(p->in[0] != -1 ? p->in[0] : p->fds[0],
+- STDIN_FILENO) == -1) ||
+- (moveDescriptor(p->out[1]!= -1 ? p->out[1] : p->fds[1],
+- STDOUT_FILENO) == -1))
+- goto WhyCantJohnnyExec;
+-
+- if (p->redirectErrorStream) {
+- if ((closeSafely(p->err[1]) == -1) ||
+- (restartableDup2(STDOUT_FILENO, STDERR_FILENO) == -1))
+- goto WhyCantJohnnyExec;
+- } else {
+- if (moveDescriptor(p->err[1] != -1 ? p->err[1] : p->fds[2],
+- STDERR_FILENO) == -1)
+- goto WhyCantJohnnyExec;
+- }
+-
+- if (moveDescriptor(p->fail[1], FAIL_FILENO) == -1)
+- goto WhyCantJohnnyExec;
+-
+- /* close everything */
+- if (closeDescriptors() == 0) { /* failed, close the old way */
+- int max_fd = (int)sysconf(_SC_OPEN_MAX);
+- int fd;
+- for (fd = FAIL_FILENO + 1; fd < max_fd; fd++)
+- if (restartableClose(fd) == -1 && errno != EBADF)
+- goto WhyCantJohnnyExec;
+- }
+-
+- /* change to the new working directory */
+- if (p->pdir != NULL && chdir(p->pdir) < 0)
+- goto WhyCantJohnnyExec;
+-
+- if (fcntl(FAIL_FILENO, F_SETFD, FD_CLOEXEC) == -1)
+- goto WhyCantJohnnyExec;
+-
+- JDK_execvpe(p->argv[0], p->argv, p->envv);
+-
+- WhyCantJohnnyExec:
+- /* We used to go to an awful lot of trouble to predict whether the
+- * child would fail, but there is no reliable way to predict the
+- * success of an operation without *trying* it, and there's no way
+- * to try a chdir or exec in the parent. Instead, all we need is a
+- * way to communicate any failure back to the parent. Easy; we just
+- * send the errno back to the parent over a pipe in case of failure.
+- * The tricky thing is, how do we communicate the *success* of exec?
+- * We use FD_CLOEXEC together with the fact that a read() on a pipe
+- * yields EOF when the write ends (we have two of them!) are closed.
+- */
+- {
+- int errnum = errno;
+- restartableWrite(FAIL_FILENO, &errnum, sizeof(errnum));
+- }
+- restartableClose(FAIL_FILENO);
+- _exit(-1);
+- return 0; /* Suppress warning "no return value from function" */
++ if (arg == 0) {
++ return offset;
++ }
++ for (p=buf+offset, a=arg; *a != 0; a++) {
++ int len = strlen(*a) +1;
++ memcpy(p, *a, len);
++ p += len;
++ count += len;
++ }
++ return offset+count;
+ }
+
+ /**
+- * Start a child process running function childProcess.
+- * This function only returns in the parent.
+ * We are unusually paranoid; use of clone/vfork is
+ * especially likely to tickle gcc/glibc bugs.
+ */
+ #ifdef __attribute_noinline__ /* See: sys/cdefs.h */
+ __attribute_noinline__
+ #endif
++
++#define START_CHILD_USE_CLONE 0 /* clone() currently disabled; see above. */
++
++#ifdef START_CHILD_USE_CLONE
+ static pid_t
+-startChild(ChildStuff *c) {
+-#if START_CHILD_USE_CLONE
++cloneChild(ChildStuff *c) {
++#ifdef __linux__
+ #define START_CHILD_CLONE_STACK_SIZE (64 * 1024)
+ /*
+ * See clone(2).
+@@ -800,33 +414,161 @@
+ c->clone_stack + START_CHILD_CLONE_STACK_SIZE,
+ CLONE_VFORK | CLONE_VM | SIGCHLD, c);
+ #else
+- #if START_CHILD_USE_VFORK
++/* not available on Solaris / Mac */
++ assert(0);
++ return -1;
++#endif
++}
++#endif
++
++static pid_t
++vforkChild(ChildStuff *c) {
++ volatile pid_t resultPid;
++
+ /*
+ * We separate the call to vfork into a separate function to make
+ * very sure to keep stack of child from corrupting stack of parent,
+ * as suggested by the scary gcc warning:
+ * warning: variable 'foo' might be clobbered by 'longjmp' or 'vfork'
+ */
+- volatile pid_t resultPid = vfork();
+- #else
++ resultPid = vfork();
++
++ if (resultPid == 0) {
++ childProcess(c);
++ }
++ assert(resultPid != 0); /* childProcess never returns */
++ return resultPid;
++}
++
++static pid_t
++forkChild(ChildStuff *c) {
++ pid_t resultPid;
++
+ /*
+ * From Solaris fork(2): In Solaris 10, a call to fork() is
+ * identical to a call to fork1(); only the calling thread is
+ * replicated in the child process. This is the POSIX-specified
+ * behavior for fork().
+ */
+- pid_t resultPid = fork();
+- #endif
+- if (resultPid == 0)
++ resultPid = fork();
++
++ if (resultPid == 0) {
+ childProcess(c);
++ }
+ assert(resultPid != 0); /* childProcess never returns */
+ return resultPid;
+-#endif /* ! START_CHILD_USE_CLONE */
++}
++
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
++static pid_t
++spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) {
++ pid_t resultPid;
++ jboolean isCopy;
++ int i, offset, rval, bufsize, magic;
++ char *buf, buf1[16];
++ char *hlpargs[2];
++ SpawnInfo sp;
++
++ /* need to tell helper which fd is for receiving the childstuff
++ * and which fd to send response back on
++ */
++ snprintf(buf1, sizeof(buf1), "%d:%d", c->childenv[0], c->fail[1]);
++ /* put the fd string as argument to the helper cmd */
++ hlpargs[0] = buf1;
++ hlpargs[1] = 0;
++
++ /* Following items are sent down the pipe to the helper
++ * after it is spawned.
++ * All strings are null terminated. All arrays of strings
++ * have an empty string for termination.
++ * - the ChildStuff struct
++ * - the SpawnInfo struct
++ * - the argv strings array
++ * - the envv strings array
++ * - the home directory string
++ * - the parentPath string
++ * - the parentPathv array
++ */
++ /* First calculate the sizes */
++ arraysize(c->argv, &sp.nargv, &sp.argvBytes);
++ bufsize = sp.argvBytes;
++ arraysize(c->envv, &sp.nenvv, &sp.envvBytes);
++ bufsize += sp.envvBytes;
++ sp.dirlen = c->pdir == 0 ? 0 : strlen(c->pdir)+1;
++ bufsize += sp.dirlen;
++ arraysize(parentPathv, &sp.nparentPathv, &sp.parentPathvBytes);
++ bufsize += sp.parentPathvBytes;
++ /* We need to clear FD_CLOEXEC if set in the fds[].
++ * Files are created FD_CLOEXEC in Java.
++ * Otherwise, they will be closed when the target gets exec'd */
++ for (i=0; i<3; i++) {
++ if (c->fds[i] != -1) {
++ int flags = fcntl(c->fds[i], F_GETFD);
++ if (flags & FD_CLOEXEC) {
++ fcntl(c->fds[i], F_SETFD, flags & (~1));
++ }
++ }
++ }
++
++ rval = posix_spawn(&resultPid, helperpath, 0, 0, (char * const *) hlpargs, environ);
++
++ if (rval != 0) {
++ return -1;
++ }
++
++ /* now the lengths are known, copy the data */
++ buf = NEW(char, bufsize);
++ if (buf == 0) {
++ return -1;
++ }
++ offset = copystrings(buf, 0, &c->argv[0]);
++ offset = copystrings(buf, offset, &c->envv[0]);
++ memcpy(buf+offset, c->pdir, sp.dirlen);
++ offset += sp.dirlen;
++ offset = copystrings(buf, offset, parentPathv);
++ assert(offset == bufsize);
++
++ magic = magicNumber();
++
++ /* write the two structs and the data buffer */
++ write(c->childenv[1], (char *)&magic, sizeof(magic)); // magic number first
++ write(c->childenv[1], (char *)c, sizeof(*c));
++ write(c->childenv[1], (char *)&sp, sizeof(sp));
++ write(c->childenv[1], buf, bufsize);
++ free(buf);
++
++ /* In this mode an external main() in invoked which calls back into
++ * childProcess() in this file, rather than directly
++ * via the statement below */
++ return resultPid;
++}
++#endif
++
++/*
++ * Start a child process running function childProcess.
++ * This function only returns in the parent.
++ */
++static pid_t
++startChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) {
++ switch (c->mode) {
++ case MODE_VFORK:
++ return vforkChild(c);
++ case MODE_FORK:
++ return forkChild(c);
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
++ case MODE_POSIX_SPAWN:
++ return spawnChild(env, process, c, helperpath);
++#endif
++ default:
++ return -1;
++ }
+ }
+
+ JNIEXPORT jint JNICALL
+ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
+ jobject process,
++ jint mode,
++ jbyteArray helperpath,
+ jbyteArray prog,
+ jbyteArray argBlock, jint argc,
+ jbyteArray envBlock, jint envc,
+@@ -836,32 +578,35 @@
+ {
+ int errnum;
+ int resultPid = -1;
+- int in[2], out[2], err[2], fail[2];
++ int in[2], out[2], err[2], fail[2], childenv[2];
+ jint *fds = NULL;
++ const char *phelperpath = NULL;
+ const char *pprog = NULL;
+ const char *pargBlock = NULL;
+ const char *penvBlock = NULL;
+ ChildStuff *c;
+
+ in[0] = in[1] = out[0] = out[1] = err[0] = err[1] = fail[0] = fail[1] = -1;
++ childenv[0] = childenv[1] = -1;
+
+ if ((c = NEW(ChildStuff, 1)) == NULL) return -1;
+ c->argv = NULL;
+ c->envv = NULL;
+ c->pdir = NULL;
+-#if START_CHILD_USE_CLONE
+ c->clone_stack = NULL;
+-#endif
+
+ /* Convert prog + argBlock into a char ** argv.
+ * Add one word room for expansion of argv for use by
+ * execve_as_traditional_shell_script.
++ * This word is also used when using spawn mode
+ */
+ assert(prog != NULL && argBlock != NULL);
++ if ((phelperpath = getBytes(env, helperpath)) == NULL) goto Catch;
+ if ((pprog = getBytes(env, prog)) == NULL) goto Catch;
+ if ((pargBlock = getBytes(env, argBlock)) == NULL) goto Catch;
+ if ((c->argv = NEW(const char *, argc + 3)) == NULL) goto Catch;
+ c->argv[0] = pprog;
++ c->argc = argc + 2;
+ initVectorFromBlock(c->argv+1, pargBlock, argc);
+
+ if (envBlock != NULL) {
+@@ -882,6 +627,7 @@
+ if ((fds[0] == -1 && pipe(in) < 0) ||
+ (fds[1] == -1 && pipe(out) < 0) ||
+ (fds[2] == -1 && pipe(err) < 0) ||
++ (pipe(childenv) < 0) ||
+ (pipe(fail) < 0)) {
+ throwIOException(env, errno, "Bad file descriptor");
+ goto Catch;
+@@ -894,18 +640,29 @@
+ copyPipe(out, c->out);
+ copyPipe(err, c->err);
+ copyPipe(fail, c->fail);
++ copyPipe(childenv, c->childenv);
+
+ c->redirectErrorStream = redirectErrorStream;
++ c->mode = mode;
+
+- resultPid = startChild(c);
++ resultPid = startChild(env, process, c, phelperpath);
+ assert(resultPid != 0);
+
+ if (resultPid < 0) {
+- throwIOException(env, errno, START_CHILD_SYSTEM_CALL " failed");
++ switch (c->mode) {
++ case MODE_VFORK:
++ throwIOException(env, errno, "vfork failed");
++ break;
++ case MODE_FORK:
++ throwIOException(env, errno, "fork failed");
++ break;
++ case MODE_POSIX_SPAWN:
++ throwIOException(env, errno, "spawn failed");
++ break;
++ }
+ goto Catch;
+ }
+-
+- restartableClose(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec */
++ close(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec (childproc.c) */
+
+ switch (readFully(fail[0], &errnum, sizeof(errnum))) {
+ case 0: break; /* Exec succeeded */
+@@ -923,18 +680,18 @@
+ fds[2] = (err[0] != -1) ? err[0] : -1;
+
+ Finally:
+-#if START_CHILD_USE_CLONE
+ free(c->clone_stack);
+-#endif
+
+ /* Always clean up the child's side of the pipes */
+ closeSafely(in [0]);
+ closeSafely(out[1]);
+ closeSafely(err[1]);
+
+- /* Always clean up fail descriptors */
++ /* Always clean up fail and childEnv descriptors */
+ closeSafely(fail[0]);
+ closeSafely(fail[1]);
++ closeSafely(childenv[0]);
++ closeSafely(childenv[1]);
+
+ releaseBytes(env, prog, pprog);
+ releaseBytes(env, argBlock, pargBlock);
+@@ -952,9 +709,9 @@
+
+ Catch:
+ /* Clean up the parent's side of the pipes in case of failure only */
+- closeSafely(in [1]);
+- closeSafely(out[0]);
+- closeSafely(err[0]);
++ closeSafely(in [1]); in[1] = -1;
++ closeSafely(out[0]); out[0] = -1;
++ closeSafely(err[0]); err[0] = -1;
+ goto Finally;
+ }
+
+--- jdk/src/solaris/native/java/lang/childproc.c 1969-12-31 16:00:00.000000000 -0800
++++ jdk/src/solaris/native/java/lang/childproc.c 2014-04-20 12:39:22.000000000 -0700
+@@ -0,0 +1,387 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#include <dirent.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <limits.h>
++
++#include "childproc.h"
++
++
++ssize_t
++restartableWrite(int fd, const void *buf, size_t count)
++{
++ ssize_t result;
++ RESTARTABLE(write(fd, buf, count), result);
++ return result;
++}
++
++int
++restartableDup2(int fd_from, int fd_to)
++{
++ int err;
++ RESTARTABLE(dup2(fd_from, fd_to), err);
++ return err;
++}
++
++int
++closeSafely(int fd)
++{
++ return (fd == -1) ? 0 : close(fd);
++}
++
++int
++isAsciiDigit(char c)
++{
++ return c >= '0' && c <= '9';
++}
++
+#if defined(__OpenBSD__)
+static int
+closeDescriptors(void)
+{
-+ int err;
-+ RESTARTABLE(closefrom(FAIL_FILENO + 1), err);
-+ return err;
++ int err;
++ RESTARTABLE(closefrom(FAIL_FILENO + 1), err);
++ return err;
+}
+#else
+
-+#if defined(_ALLBSD_SOURCE)
- #define FD_DIR "/dev/fd"
- #define dirent64 dirent
- #define readdir64 readdir
-@@ -436,6 +446,7 @@
-
- return 1;
- }
++#ifdef _ALLBSD_SOURCE
++#define FD_DIR "/dev/fd"
++#define dirent64 dirent
++#define readdir64 readdir
++#else
++#define FD_DIR "/proc/self/fd"
++#endif
++
++int
++closeDescriptors(void)
++{
++ DIR *dp;
++ struct dirent64 *dirp;
++ int from_fd = FAIL_FILENO + 1;
++
++ /* We're trying to close all file descriptors, but opendir() might
++ * itself be implemented using a file descriptor, and we certainly
++ * don't want to close that while it's in use. We assume that if
++ * opendir() is implemented using a file descriptor, then it uses
++ * the lowest numbered file descriptor, just like open(). So we
++ * close a couple explicitly. */
++
++ close(from_fd); /* for possible use by opendir() */
++ close(from_fd + 1); /* another one for good luck */
++
++ if ((dp = opendir(FD_DIR)) == NULL)
++ return 0;
++
++ /* We use readdir64 instead of readdir to work around Solaris bug
++ * 6395699: /proc/self/fd fails to report file descriptors >= 1024 on Solaris 9
++ */
++ while ((dirp = readdir64(dp)) != NULL) {
++ int fd;
++ if (isAsciiDigit(dirp->d_name[0]) &&
++ (fd = strtol(dirp->d_name, NULL, 10)) >= from_fd + 2)
++ close(fd);
++ }
++
++ closedir(dp);
++
++ return 1;
++}
++#endif
++
++int
++moveDescriptor(int fd_from, int fd_to)
++{
++ if (fd_from != fd_to) {
++ if ((restartableDup2(fd_from, fd_to) == -1) ||
++ (close(fd_from) == -1))
++ return -1;
++ }
++ return 0;
++}
++
++int
++magicNumber() {
++ return 43110;
++}
++
++/*
++ * Reads nbyte bytes from file descriptor fd into buf,
++ * The read operation is retried in case of EINTR or partial reads.
++ *
++ * Returns number of bytes read (normally nbyte, but may be less in
++ * case of EOF). In case of read errors, returns -1 and sets errno.
++ */
++ssize_t
++readFully(int fd, void *buf, size_t nbyte)
++{
++ ssize_t remaining = nbyte;
++ for (;;) {
++ ssize_t n = read(fd, buf, remaining);
++ if (n == 0) {
++ return nbyte - remaining;
++ } else if (n > 0) {
++ remaining -= n;
++ if (remaining <= 0)
++ return nbyte;
++ /* We were interrupted in the middle of reading the bytes.
++ * Unlikely, but possible. */
++ buf = (void *) (((char *)buf) + n);
++ } else if (errno == EINTR) {
++ /* Strange signals like SIGJVM1 are possible at any time.
++ * See http://www.dreamsongs.com/WorseIsBetter.html */
++ } else {
++ return -1;
++ }
++ }
++}
++
++void
++initVectorFromBlock(const char**vector, const char* block, int count)
++{
++ int i;
++ const char *p;
++ for (i = 0, p = block; i < count; i++) {
++ /* Invariant: p always points to the start of a C string. */
++ vector[i] = p;
++ while (*(p++));
++ }
++ vector[count] = NULL;
++}
++
++/**
++ * Exec FILE as a traditional Bourne shell script (i.e. one without #!).
++ * If we could do it over again, we would probably not support such an ancient
++ * misfeature, but compatibility wins over sanity. The original support for
++ * this was imported accidentally from execvp().
++ */
++void
++execve_as_traditional_shell_script(const char *file,
++ const char *argv[],
++ const char *const envp[])
++{
++ /* Use the extra word of space provided for us in argv by caller. */
++ const char *argv0 = argv[0];
++ const char *const *end = argv;
++ while (*end != NULL)
++ ++end;
++ memmove(argv+2, argv+1, (end-argv) * sizeof(*end));
++ argv[0] = "/bin/sh";
++ argv[1] = file;
++ execve(argv[0], (char **) argv, (char **) envp);
++ /* Can't even exec /bin/sh? Big trouble, but let's soldier on... */
++ memmove(argv+1, argv+2, (end-argv) * sizeof(*end));
++ argv[0] = argv0;
++}
++
++/**
++ * Like execve(2), except that in case of ENOEXEC, FILE is assumed to
++ * be a shell script and the system default shell is invoked to run it.
++ */
++void
++execve_with_shell_fallback(int mode, const char *file,
++ const char *argv[],
++ const char *const envp[])
++{
++ if (mode == MODE_CLONE || mode == MODE_VFORK) {
++ /* shared address space; be very careful. */
++ execve(file, (char **) argv, (char **) envp);
++ if (errno == ENOEXEC)
++ execve_as_traditional_shell_script(file, argv, envp);
++ } else {
++ /* unshared address space; we can mutate environ. */
++ environ = (char **) envp;
++ execvp(file, (char **) argv);
++ }
++}
++
++/**
++ * 'execvpe' should have been included in the Unix standards,
++ * and is a GNU extension in glibc 2.10.
++ *
++ * JDK_execvpe is identical to execvp, except that the child environment is
++ * specified via the 3rd argument instead of being inherited from environ.
++ */
++void
++JDK_execvpe(int mode, const char *file,
++ const char *argv[],
++ const char *const envp[])
++{
++ if (envp == NULL || (char **) envp == environ) {
++ execvp(file, (char **) argv);
++ return;
++ }
++
++ if (*file == '\0') {
++ errno = ENOENT;
++ return;
++ }
++
++ if (strchr(file, '/') != NULL) {
++ execve_with_shell_fallback(mode, file, argv, envp);
++ } else {
++ /* We must search PATH (parent's, not child's) */
++ char expanded_file[PATH_MAX];
++ int filelen = strlen(file);
++ int sticky_errno = 0;
++ const char * const * dirs;
++ for (dirs = parentPathv; *dirs; dirs++) {
++ const char * dir = *dirs;
++ int dirlen = strlen(dir);
++ if (filelen + dirlen + 2 >= PATH_MAX) {
++ errno = ENAMETOOLONG;
++ continue;
++ }
++ memcpy(expanded_file, dir, dirlen);
++ if (expanded_file[dirlen - 1] != '/')
++ expanded_file[dirlen++] = '/';
++ memcpy(expanded_file + dirlen, file, filelen);
++ expanded_file[dirlen + filelen] = '\0';
++ execve_with_shell_fallback(mode, expanded_file, argv, envp);
++ /* There are 3 responses to various classes of errno:
++ * return immediately, continue (especially for ENOENT),
++ * or continue with "sticky" errno.
++ *
++ * From exec(3):
++ *
++ * If permission is denied for a file (the attempted
++ * execve returned EACCES), these functions will continue
++ * searching the rest of the search path. If no other
++ * file is found, however, they will return with the
++ * global variable errno set to EACCES.
++ */
++ switch (errno) {
++ case EACCES:
++ sticky_errno = errno;
++ /* FALLTHRU */
++ case ENOENT:
++ case ENOTDIR:
++#ifdef ELOOP
++ case ELOOP:
++#endif
++#ifdef ESTALE
++ case ESTALE:
++#endif
++#ifdef ENODEV
++ case ENODEV:
++#endif
++#ifdef ETIMEDOUT
++ case ETIMEDOUT:
++#endif
++ break; /* Try other directories in PATH */
++ default:
++ return;
++ }
++ }
++ if (sticky_errno != 0)
++ errno = sticky_errno;
++ }
++}
++
++/**
++ * Child process after a successful fork() or clone().
++ * This function must not return, and must be prepared for either all
++ * of its address space to be shared with its parent, or to be a copy.
++ * It must not modify global variables such as "environ".
++ */
++int
++childProcess(void *arg)
++{
++ const ChildStuff* p = (const ChildStuff*) arg;
++
++ /* Close the parent sides of the pipes.
++ Closing pipe fds here is redundant, since closeDescriptors()
++ would do it anyways, but a little paranoia is a good thing. */
++ if ((closeSafely(p->in[1]) == -1) ||
++ (closeSafely(p->out[0]) == -1) ||
++ (closeSafely(p->err[0]) == -1) ||
++ (closeSafely(p->childenv[0]) == -1) ||
++ (closeSafely(p->childenv[1]) == -1) ||
++ (closeSafely(p->fail[0]) == -1))
++ goto WhyCantJohnnyExec;
++
++ /* Give the child sides of the pipes the right fileno's. */
++ /* Note: it is possible for in[0] == 0 */
++ if ((moveDescriptor(p->in[0] != -1 ? p->in[0] : p->fds[0],
++ STDIN_FILENO) == -1) ||
++ (moveDescriptor(p->out[1]!= -1 ? p->out[1] : p->fds[1],
++ STDOUT_FILENO) == -1))
++ goto WhyCantJohnnyExec;
++
++ if (p->redirectErrorStream) {
++ if ((closeSafely(p->err[1]) == -1) ||
++ (restartableDup2(STDOUT_FILENO, STDERR_FILENO) == -1))
++ goto WhyCantJohnnyExec;
++ } else {
++ if (moveDescriptor(p->err[1] != -1 ? p->err[1] : p->fds[2],
++ STDERR_FILENO) == -1)
++ goto WhyCantJohnnyExec;
++ }
++
++ if (moveDescriptor(p->fail[1], FAIL_FILENO) == -1)
++ goto WhyCantJohnnyExec;
++
++ /* close everything */
++ if (closeDescriptors() == 0) { /* failed, close the old way */
++ int max_fd = (int)sysconf(_SC_OPEN_MAX);
++ int fd;
++ for (fd = FAIL_FILENO + 1; fd < max_fd; fd++)
++ if (close(fd) == -1 && errno != EBADF)
++ goto WhyCantJohnnyExec;
++ }
++
++ /* change to the new working directory */
++ if (p->pdir != NULL && chdir(p->pdir) < 0)
++ goto WhyCantJohnnyExec;
++
++ if (fcntl(FAIL_FILENO, F_SETFD, FD_CLOEXEC) == -1)
++ goto WhyCantJohnnyExec;
++
++ JDK_execvpe(p->mode, p->argv[0], p->argv, p->envv);
++
++ WhyCantJohnnyExec:
++ /* We used to go to an awful lot of trouble to predict whether the
++ * child would fail, but there is no reliable way to predict the
++ * success of an operation without *trying* it, and there's no way
++ * to try a chdir or exec in the parent. Instead, all we need is a
++ * way to communicate any failure back to the parent. Easy; we just
++ * send the errno back to the parent over a pipe in case of failure.
++ * The tricky thing is, how do we communicate the *success* of exec?
++ * We use FD_CLOEXEC together with the fact that a read() on a pipe
++ * yields EOF when the write ends (we have two of them!) are closed.
++ */
++ {
++ int errnum = errno;
++ restartableWrite(FAIL_FILENO, &errnum, sizeof(errnum));
++ }
++ close(FAIL_FILENO);
++ _exit(-1);
++ return 0; /* Suppress warning "no return value from function" */
++}
+--- jdk/src/solaris/native/java/lang/childproc.h 1969-12-31 16:00:00.000000000 -0800
++++ jdk/src/solaris/native/java/lang/childproc.h 2014-04-20 12:39:22.000000000 -0700
+@@ -0,0 +1,145 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#ifndef CHILDPROC_MD_H
++#define CHILDPROC_MD_H
++
++#include <sys/types.h>
++
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
++/* This is one of the rare times it's more portable to declare an
++ * external symbol explicitly, rather than via a system header.
++ * The declaration is standardized as part of UNIX98, but there is
++ * no standard (not even de-facto) header file where the
++ * declaration is to be found. See:
++ * http://www.opengroup.org/onlinepubs/009695399/functions/environ.html
++ * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_02.html
++ *
++ * "All identifiers in this volume of IEEE Std 1003.1-2001, except
++ * environ, are defined in at least one of the headers" (!)
++ */
++extern char **environ;
++#endif
++
++#ifdef __linux__
++#include <sched.h>
++#endif
++
++#ifndef STDIN_FILENO
++#define STDIN_FILENO 0
++#endif
++
++#ifndef STDOUT_FILENO
++#define STDOUT_FILENO 1
++#endif
++
++#ifndef STDERR_FILENO
++#define STDERR_FILENO 2
++#endif
++
++#ifndef SA_NOCLDSTOP
++#define SA_NOCLDSTOP 0
++#endif
++
++#ifndef SA_RESTART
++#define SA_RESTART 0
++#endif
++
++#define FAIL_FILENO (STDERR_FILENO + 1)
++
++/* TODO: Refactor. */
++#define RESTARTABLE(_cmd, _result) do { \
++ do { \
++ _result = _cmd; \
++ } while((_result == -1) && (errno == EINTR)); \
++} while(0)
++
++/* These numbers must be the same as the Enum in UNIXProcess.java
++ * Must be a better way of doing this.
++ */
++#define MODE_FORK 1
++#define MODE_POSIX_SPAWN 2
++#define MODE_VFORK 3
++#define MODE_CLONE 4
++
++typedef struct _ChildStuff
++{
++ int in[2];
++ int out[2];
++ int err[2];
++ int fail[2];
++ int childenv[2];
++ int fds[3];
++ int mode;
++ const char **argv;
++ int argc;
++ const char **envv;
++ const char *pdir;
++ int redirectErrorStream;
++ void *clone_stack;
++} ChildStuff;
++
++/* following used in addition when mode is SPAWN */
++typedef struct _SpawnInfo {
++ int nargv; /* number of argv array elements */
++ int argvBytes; /* total number of bytes in argv array */
++ int nenvv; /* number of envv array elements */
++ int envvBytes; /* total number of bytes in envv array */
++ int dirlen; /* length of home directory string */
++ int nparentPathv; /* number of elements in parentPathv array */
++ int parentPathvBytes; /* total number of bytes in parentPathv array */
++} SpawnInfo;
++
++/**
++ * The cached and split version of the JDK's effective PATH.
++ * (We don't support putenv("PATH=...") in native code)
++ */
++const char * const *parentPathv;
++
++ssize_t restartableWrite(int fd, const void *buf, size_t count);
++int restartableDup2(int fd_from, int fd_to);
++int closeSafely(int fd);
++int isAsciiDigit(char c);
++int closeDescriptors(void);
++int moveDescriptor(int fd_from, int fd_to);
++
++int magicNumber();
++ssize_t readFully(int fd, void *buf, size_t nbyte);
++void initVectorFromBlock(const char**vector, const char* block, int count);
++void execve_as_traditional_shell_script(const char *file,
++ const char *argv[],
++ const char *const envp[]);
++void execve_with_shell_fallback(int mode, const char *file,
++ const char *argv[],
++ const char *const envp[]);
++void JDK_execvpe(int mode, const char *file,
++ const char *argv[],
++ const char *const envp[]);
++int childProcess(void *arg);
++
+#endif
-
- static int
- moveDescriptor(int fd_from, int fd_to)
--- jdk/src/solaris/native/java/lang/java_props_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/lang/java_props_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/lang/java_props_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -151,7 +151,7 @@
lc = setlocale(cat, NULL);
#endif
@@ -69579,8 +58462,160 @@
} else {
sprops.language = "en";
sprops.encoding = "ISO8859-1";
+--- jdk/src/solaris/native/java/lang/jspawnhelper.c 1969-12-31 16:00:00.000000000 -0800
++++ jdk/src/solaris/native/java/lang/jspawnhelper.c 2014-04-20 12:39:22.000000000 -0700
+@@ -0,0 +1,149 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#include <errno.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++
++#include "childproc.h"
++
++extern int errno;
++
++#define ALLOC(X,Y) { \
++ void *mptr; \
++ mptr = malloc (Y); \
++ if (mptr == 0) { \
++ error (fdout, ERR_MALLOC); \
++ } \
++ X = mptr; \
++}
++
++#define ERR_MALLOC 1
++#define ERR_PIPE 2
++#define ERR_ARGS 3
++
++void error (int fd, int err) {
++ write (fd, &err, sizeof(err));
++ exit (1);
++}
++
++void shutItDown() {
++ fprintf(stdout, "This command is not for general use and should ");
++ fprintf(stdout, "only be run as the result of a call to\n");
++ fprintf(stdout, "ProcessBuilder.start() or Runtime.exec() in a java ");
++ fprintf(stdout, "application\n");
++ _exit(1);
++}
++
++/*
++ * read the following off the pipefd
++ * - the ChildStuff struct
++ * - the SpawnInfo struct
++ * - the data strings for fields in ChildStuff
++ */
++void initChildStuff (int fdin, int fdout, ChildStuff *c) {
++ int n;
++ int argvBytes, nargv, envvBytes, nenvv;
++ int dirlen;
++ char *buf;
++ SpawnInfo sp;
++ int bufsize, offset=0;
++ int magic;
++ int res;
++
++ res = readFully (fdin, &magic, sizeof(magic));
++ if (res != 4 || magic != magicNumber()) {
++ error (fdout, ERR_PIPE);
++ }
++
++ if (readFully (fdin, c, sizeof(*c)) == -1) {
++ error (fdout, ERR_PIPE);
++ }
++
++ if (readFully (fdin, &sp, sizeof(sp)) == -1) {
++ error (fdout, ERR_PIPE);
++ }
++
++ bufsize = sp.argvBytes + sp.envvBytes +
++ sp.dirlen + sp.parentPathvBytes;
++
++ ALLOC(buf, bufsize);
++
++ if (readFully (fdin, buf, bufsize) == -1) {
++ error (fdout, ERR_PIPE);
++ }
++
++ /* Initialize argv[] */
++ ALLOC(c->argv, sizeof(char *) * sp.nargv);
++ initVectorFromBlock (c->argv, buf+offset, sp.nargv-1);
++ offset += sp.argvBytes;
++
++ /* Initialize envv[] */
++ if (sp.nenvv == 0) {
++ c->envv = 0;
++ } else {
++ ALLOC(c->envv, sizeof(char *) * sp.nenvv);
++ initVectorFromBlock (c->envv, buf+offset, sp.nenvv-1);
++ offset += sp.envvBytes;
++ }
++
++ /* Initialize pdir */
++ if (sp.dirlen == 0) {
++ c->pdir = 0;
++ } else {
++ c->pdir = buf+offset;
++ offset += sp.dirlen;
++ }
++
++ /* Initialize parentPathv[] */
++ ALLOC(parentPathv, sizeof (char *) * sp.nparentPathv)
++ initVectorFromBlock ((const char**)parentPathv, buf+offset, sp.nparentPathv-1);
++ offset += sp.parentPathvBytes;
++}
++
++int main(int argc, char *argv[]) {
++ ChildStuff c;
++ int t;
++ struct stat buf;
++ /* argv[0] contains the fd number to read all the child info */
++ int r, fdin, fdout;
++
++ r = sscanf (argv[argc-1], "%d:%d", &fdin, &fdout);
++ if (r == 2 && fcntl(fdin, F_GETFD) != -1) {
++ fstat(fdin, &buf);
++ if (!S_ISFIFO(buf.st_mode))
++ shutItDown();
++ } else {
++ shutItDown();
++ }
++ initChildStuff (fdin, fdout, &c);
++
++ childProcess (&c);
++ return 0; /* NOT REACHED */
++}
--- jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -122,7 +122,6 @@
static jclass ni_ia6cls;
static jmethodID ni_ia4ctrID;
@@ -69643,7 +58678,7 @@
(*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
inet6Index++;
--- jdk/src/solaris/native/java/net/NetworkInterface.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/NetworkInterface.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/net/NetworkInterface.c 2014-04-20 12:39:22.000000000 -0700
@@ -60,14 +60,18 @@
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -69753,7 +58788,7 @@
}
--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
*/
@@ -69802,7 +58837,7 @@
memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr));
--- jdk/src/solaris/native/java/net/bsd_close.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/bsd_close.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/net/bsd_close.c 2014-04-20 12:39:22.000000000 -0700
@@ -345,6 +345,76 @@
* signal other than our wakeup signal.
*/
@@ -69887,7 +58922,7 @@
+#endif
}
--- jdk/src/solaris/native/java/net/net_util_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/net_util_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/net/net_util_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -45,6 +45,10 @@
#endif
#endif
@@ -69899,6 +58934,18 @@
#ifdef __solaris__
#include <sys/sockio.h>
#include <stropts.h>
+@@ -114,9 +118,9 @@
+ static jfieldID ni_defaultIndexID;
+ if (ni_class == NULL) {
+ jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
+- CHECK_NULL(c);
++ CHECK_NULL_RETURN(c, 0);
+ c = (*env)->NewGlobalRef(env, c);
+- CHECK_NULL(c);
++ CHECK_NULL_RETURN(c, 0);
+ ni_defaultIndexID = (*env)->GetStaticFieldID(
+ env, c, "defaultIndex", "I");
+ ni_class = c;
@@ -138,8 +142,7 @@
* of the parameter is assumed to be an 'int'. If the parameter
* cannot be obtained return -1
@@ -69997,7 +59044,7 @@
return setsockopt(fd, level, opt, arg, len);
}
--- jdk/src/solaris/native/java/net/net_util_md.h 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/net/net_util_md.h 2014-01-18 12:16:34.000000000 -0800
++++ jdk/src/solaris/native/java/net/net_util_md.h 2014-04-20 12:39:22.000000000 -0700
@@ -37,7 +37,7 @@
#endif
@@ -70018,7 +59065,7 @@
/* needed from libsocket on Solaris 8 */
--- jdk/src/solaris/native/java/util/TimeZone_md.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/java/util/TimeZone_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/java/util/TimeZone_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -123,7 +123,7 @@
return NULL;
}
@@ -70053,7 +59100,7 @@
-#endif /* MACOSX */
+#endif /* _ALLBSD_SOURCE */
--- jdk/src/solaris/native/sun/awt/awt_Font.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_Font.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_Font.c 2014-04-20 12:39:22.000000000 -0700
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -70064,7 +59111,7 @@
family = "lucida";
}
--- jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-04-20 12:39:22.000000000 -0700
@@ -123,7 +123,7 @@
*/
@@ -70125,7 +59172,7 @@
return point;
}
--- jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-04-20 12:39:22.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -70365,8 +59412,26 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
+--- jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2013-09-06 11:29:10.000000000 -0700
++++ jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -96,7 +96,7 @@
+ jvm = vm;
+
+ /* Get address of this library and the directory containing it. */
+- dladdr((void *)JNI_OnLoad, &dlinfo);
++ dladdr((void *)AWT_OnLoad, &dlinfo);
+ realpath((char *)dlinfo.dli_fname, buf);
+ len = strlen(buf);
+ p = strrchr(buf, '/');
--- jdk/src/solaris/native/sun/awt/awt_Robot.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-04-20 12:39:22.000000000 -0700
@@ -46,7 +46,7 @@
#include "wsutils.h"
#include "list.h"
@@ -70377,7 +59442,7 @@
#endif
--- jdk/src/solaris/native/sun/awt/awt_util.h 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_util.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_util.h 2014-04-20 12:39:22.000000000 -0700
@@ -187,7 +187,7 @@
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -70397,7 +59462,7 @@
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
--- jdk/src/solaris/native/sun/awt/awt_wm.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_wm.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_wm.c 2014-04-20 12:39:22.000000000 -0700
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -70496,7 +59561,7 @@
}
else {
--- jdk/src/solaris/native/sun/awt/awt_wm.h 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/awt_wm.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/awt_wm.h 2014-04-20 12:39:22.000000000 -0700
@@ -45,7 +45,10 @@
KDE2_WM,
SAWFISH_WM,
@@ -70510,7 +59575,7 @@
extern void awt_wm_init(void);
--- jdk/src/solaris/native/sun/awt/extutil.h 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/extutil.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/extutil.h 2014-04-20 12:39:22.000000000 -0700
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -70527,7 +59592,7 @@
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || _ALLBSD_SOURCE */
--- jdk/src/solaris/native/sun/awt/fontpath.c 2013-09-06 11:29:10.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/fontpath.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/fontpath.c 2014-04-20 12:39:22.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
*/
@@ -70606,7 +59671,7 @@
#endif
#endif /* !HEADLESS */
--- jdk/src/solaris/native/sun/awt/robot_common.c 2013-09-06 11:29:11.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/robot_common.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/robot_common.c 2014-04-20 12:39:22.000000000 -0700
@@ -27,7 +27,7 @@
#error This file should not be included in headless library
#endif
@@ -70617,7 +59682,7 @@
#endif
--- jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2013-09-06 11:29:11.000000000 -0700
-+++ jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2014-01-18 12:16:31.000000000 -0800
++++ jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2014-04-20 12:39:22.000000000 -0700
@@ -577,8 +577,8 @@
SplashUnlock(splash);
rc = poll(pfd, 2, timeout);
@@ -70630,7 +59695,7 @@
SplashUpdateShape(splash);
SplashRedrawWindow(splash);
--- jdk/src/solaris/native/sun/java2d/j2d_md.h 2013-09-06 11:29:11.000000000 -0700
-+++ jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-04-20 12:39:22.000000000 -0700
@@ -28,9 +28,9 @@
#include <sys/types.h>
@@ -70644,7 +59709,7 @@
#endif /* __linux__ || MACOSX */
--- jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2013-09-06 11:29:11.000000000 -0700
-+++ jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-04-20 12:39:22.000000000 -0700
@@ -804,7 +804,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -70655,7 +59720,7 @@
#else
# define ULTRA_CHIP "sun4u"
--- jdk/src/solaris/native/sun/net/portconfig.c 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/src/solaris/native/sun/net/portconfig.c 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/solaris/native/sun/net/portconfig.c 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -70780,7 +59845,7 @@
+}
+#endif
--- jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -201,7 +201,7 @@
return IOS_THROWN;
}
@@ -70800,7 +59865,7 @@
if (numBytes > 0)
--- jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -227,6 +227,21 @@
fl.l_start = (off64_t)pos;
fl.l_type = F_UNLCK;
@@ -70824,7 +59889,7 @@
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
--- jdk/src/solaris/native/sun/nio/ch/Sctp.h 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/nio/ch/Sctp.h 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/nio/ch/Sctp.h 2014-04-20 12:39:22.000000000 -0700
@@ -320,8 +320,20 @@
typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
@@ -70865,7 +59930,7 @@
#endif /* !SUN_NIO_CH_SCTP_H */
--- jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2014-04-20 12:39:22.000000000 -0700
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -70883,7 +59948,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
--- jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -33,6 +33,11 @@
#include "j2secmod.h"
@@ -70919,7 +59984,7 @@
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
--- jdk/src/solaris/native/sun/xawt/XWindow.c 2013-09-06 11:29:12.000000000 -0700
-+++ jdk/src/solaris/native/sun/xawt/XWindow.c 2014-01-18 12:16:33.000000000 -0800
++++ jdk/src/solaris/native/sun/xawt/XWindow.c 2014-04-20 12:39:22.000000000 -0700
@@ -867,7 +867,7 @@
{
KeySym originalKeysym = *keysym;
@@ -70929,8 +59994,253 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
+--- jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java 2013-09-06 11:29:13.000000000 -0700
++++ jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -41,6 +41,7 @@
+
+ import static sun.awt.shell.Win32ShellFolder2.*;
+ import sun.awt.OSInfo;
++import sun.misc.ThreadGroupUtils;
+
+ // NOTE: This class supersedes Win32ShellFolderManager, which was removed
+ // from distribution after version 1.4.2.
+@@ -505,23 +506,19 @@
+ }
+ }
+ };
+- comThread =
+- AccessController.doPrivileged(
+- new PrivilegedAction<Thread>() {
+- public Thread run() {
++ comThread = AccessController.doPrivileged(new PrivilegedAction<Thread>() {
++ @Override
++ public Thread run() {
+ /* The thread must be a member of a thread group
+ * which will not get GCed before VM exit.
+ * Make its parent the top-level thread group.
+ */
+- ThreadGroup tg = Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null;
+- tg = tgn, tgn = tg.getParent());
+- Thread thread = new Thread(tg, comRun, "Swing-Shell");
+- thread.setDaemon(true);
+- return thread;
+- }
+- }
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ Thread thread = new Thread(rootTG, comRun, "Swing-Shell");
++ thread.setDaemon(true);
++ return thread;
++ }
++ }
+ );
+ return comThread;
+ }
+--- jdk/src/windows/classes/sun/awt/windows/WClipboard.java 2013-09-06 11:29:13.000000000 -0700
++++ jdk/src/windows/classes/sun/awt/windows/WClipboard.java 2014-04-20 12:39:22.000000000 -0700
+@@ -63,7 +63,6 @@
+ }
+
+ protected void setContentsNative(Transferable contents) {
+-
+ // Don't use delayed Clipboard rendering for the Transferable's data.
+ // If we did that, we would call Transferable.getTransferData on
+ // the Toolkit thread, which is a security hole.
+@@ -72,7 +71,7 @@
+ // translated. Then, for each format, translate the data and post
+ // it to the Clipboard.
+ Map formatMap = WDataTransferer.getInstance().
+- getFormatsForTransferable(contents, flavorMap);
++ getFormatsForTransferable(contents, getDefaultFlavorTable());
+
+ openClipboard(this);
+
+--- jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2013-09-06 11:29:13.000000000 -0700
++++ jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -38,6 +38,7 @@
+ import java.security.PrivilegedAction;
+ import sun.awt.AWTAutoShutdown;
+ import sun.awt.SunToolkit;
++import sun.misc.ThreadGroupUtils;
+ import sun.awt.Win32GraphicsDevice;
+ import sun.awt.Win32GraphicsEnvironment;
+ import sun.java2d.d3d.D3DRenderQueue;
+@@ -215,7 +216,7 @@
+
+ private static native void postDispose();
+
+- private static native boolean startToolkitThread(Runnable thread);
++ private static native boolean startToolkitThread(Runnable thread, ThreadGroup rootThreadGroup);
+
+ public WToolkit() {
+ // Startup toolkit threads
+@@ -232,8 +233,15 @@
+ */
+ AWTAutoShutdown.notifyToolkitThreadBusy();
+
+- if (!startToolkitThread(this)) {
+- Thread toolkitThread = new Thread(this, "AWT-Windows");
++ // Find a root TG and attach Appkit thread to it
++ ThreadGroup rootTG = AccessController.doPrivileged(new PrivilegedAction<ThreadGroup>() {
++ @Override
++ public ThreadGroup run() {
++ return ThreadGroupUtils.getRootThreadGroup();
++ }
++ });
++ if (!startToolkitThread(this, rootTG)) {
++ Thread toolkitThread = new Thread(rootTG, this, "AWT-Windows");
+ toolkitThread.setDaemon(true);
+ toolkitThread.start();
+ }
+@@ -263,14 +271,7 @@
+ private final void registerShutdownHook() {
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+- ThreadGroup currentTG =
+- Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = currentTG.getParent();
+- while (parentTG != null) {
+- currentTG = parentTG;
+- parentTG = currentTG.getParent();
+- }
+- Thread shutdown = new Thread(currentTG, new Runnable() {
++ Thread shutdown = new Thread(ThreadGroupUtils.getRootThreadGroup(), new Runnable() {
+ public void run() {
+ shutdown();
+ }
+@@ -283,7 +284,14 @@
+ }
+
+ public void run() {
+- Thread.currentThread().setPriority(Thread.NORM_PRIORITY+1);
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ Thread.currentThread().setContextClassLoader(null);
++ return null;
++ }
++ });
++ Thread.currentThread().setPriority(Thread.NORM_PRIORITY + 1);
+ boolean startPump = init();
+
+ if (startPump) {
+--- jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java 2013-09-06 11:29:13.000000000 -0700
++++ jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -36,8 +36,9 @@
+ import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.HashMap;
+-import sun.awt.SunToolkit;
++
+ import sun.awt.AWTAccessor;
++import sun.misc.ThreadGroupUtils;
+ import sun.awt.Win32GraphicsConfig;
+ import sun.awt.windows.WComponentPeer;
+ import sun.java2d.InvalidPipeException;
+@@ -92,30 +93,26 @@
+ public D3DScreenUpdateManager() {
+ done = false;
+ AccessController.doPrivileged(
+- new PrivilegedAction() {
+- public Object run() {
+- ThreadGroup currentTG =
+- Thread.currentThread().getThreadGroup();
+- ThreadGroup parentTG = currentTG.getParent();
+- while (parentTG != null) {
+- currentTG = parentTG;
+- parentTG = currentTG.getParent();
+- }
+- Thread shutdown = new Thread(currentTG, new Runnable() {
++ new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ Thread shutdown = new Thread(rootTG, new Runnable() {
++ @Override
+ public void run() {
+ done = true;
+ wakeUpUpdateThread();
+ }
+ });
+- shutdown.setContextClassLoader(null);
+- try {
+- Runtime.getRuntime().addShutdownHook(shutdown);
+- } catch (Exception e) {
+- done = true;
++ shutdown.setContextClassLoader(null);
++ try {
++ Runtime.getRuntime().addShutdownHook(shutdown);
++ } catch (Exception e) {
++ done = true;
++ }
++ return null;
+ }
+- return null;
+ }
+- }
+ );
+ }
+
+@@ -354,21 +351,20 @@
+ */
+ private synchronized void startUpdateThread() {
+ if (screenUpdater == null) {
+- screenUpdater = (Thread)java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction() {
+- public Object run() {
+- ThreadGroup tg =
+- Thread.currentThread().getThreadGroup();
+- for (ThreadGroup tgn = tg;
+- tgn != null; tg = tgn, tgn = tg.getParent());
+- Thread t = new Thread(tg, D3DScreenUpdateManager.this,
+- "D3D Screen Updater");
+- // REMIND: should it be higher?
+- t.setPriority(Thread.NORM_PRIORITY + 2);
+- t.setDaemon(true);
+- return t;
+- }
+- });
++ screenUpdater = AccessController.doPrivileged(
++ new PrivilegedAction<Thread>() {
++ @Override
++ public Thread run() {
++ ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
++ Thread t = new Thread(rootTG,
++ D3DScreenUpdateManager.this,
++ "D3D Screen Updater");
++ // REMIND: should it be higher?
++ t.setPriority(Thread.NORM_PRIORITY + 2);
++ t.setDaemon(true);
++ return t;
++ }
++ });
+ screenUpdater.start();
+ } else {
+ wakeUpUpdateThread();
--- jdk/src/windows/classes/sun/net/PortConfig.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/src/windows/classes/sun/net/PortConfig.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/windows/classes/sun/net/PortConfig.java 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -70998,7 +60308,7 @@
+ }
+}
--- jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2013-09-06 11:29:14.000000000 -0700
-+++ jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2014-04-20 12:39:22.000000000 -0700
@@ -31,6 +31,9 @@
import java.net.*;
import java.util.concurrent.*;
@@ -71043,8 +60353,33 @@
} catch (IOException x) {
bindException = x;
}
+--- jdk/src/windows/native/java/lang/java_props_md.c 2013-09-06 11:29:15.000000000 -0700
++++ jdk/src/windows/native/java/lang/java_props_md.c 2014-04-20 12:39:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -448,6 +448,7 @@
+ case 0: sprops.os_name = "Windows Vista"; break;
+ case 1: sprops.os_name = "Windows 7"; break;
+ case 2: sprops.os_name = "Windows 8"; break;
++ case 3: sprops.os_name = "Windows 8.1"; break;
+ default: sprops.os_name = "Windows NT (unknown)";
+ }
+ } else {
+@@ -455,6 +456,7 @@
+ case 0: sprops.os_name = "Windows Server 2008"; break;
+ case 1: sprops.os_name = "Windows Server 2008 R2"; break;
+ case 2: sprops.os_name = "Windows Server 2012"; break;
++ case 3: sprops.os_name = "Windows Server 2012 R2"; break;
+ default: sprops.os_name = "Windows NT (unknown)";
+ }
+ }
--- jdk/src/windows/native/java/net/Inet6AddressImpl.c 2013-09-06 11:29:15.000000000 -0700
-+++ jdk/src/windows/native/java/net/Inet6AddressImpl.c 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/windows/native/java/net/Inet6AddressImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -77,7 +77,6 @@
static jclass ni_ia6cls;
static jmethodID ni_ia4ctrID;
@@ -71094,7 +60429,7 @@
(*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
inet6Index ++;
--- jdk/src/windows/native/java/net/NetworkInterface.c 2013-09-06 11:29:15.000000000 -0700
-+++ jdk/src/windows/native/java/net/NetworkInterface.c 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/windows/native/java/net/NetworkInterface.c 2014-04-20 12:39:22.000000000 -0700
@@ -72,8 +72,6 @@
jclass ni_ia6cls; /* Inet6Address */
@@ -71138,7 +60473,7 @@
if (ibObj == NULL) {
free_netaddr(netaddrP);
--- jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2013-09-06 11:29:15.000000000 -0700
-+++ jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2014-04-20 12:39:22.000000000 -0700
@@ -499,19 +499,15 @@
int scope;
iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
@@ -71164,7 +60499,7 @@
if (ibObj == NULL) {
free_netaddr(netaddrP);
--- jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2013-09-06 11:29:15.000000000 -0700
-+++ jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2014-04-20 12:39:22.000000000 -0700
@@ -728,7 +728,6 @@
setInetAddress_family(env, socketAddressObj, IPv4);
(*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
@@ -71188,7 +60523,7 @@
/* fields common to AF_INET and AF_INET6 */
--- jdk/src/windows/native/java/net/net_util_md.c 2013-09-06 11:29:15.000000000 -0700
-+++ jdk/src/windows/native/java/net/net_util_md.c 2013-12-01 11:14:37.000000000 -0800
++++ jdk/src/windows/native/java/net/net_util_md.c 2014-04-20 12:39:22.000000000 -0700
@@ -851,7 +851,6 @@
family = (iafam == IPv4)? AF_INET : AF_INET6;
if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) {
@@ -71210,8 +60545,103 @@
}
memset((char *)him6, 0, sizeof(struct SOCKADDR_IN6));
+--- jdk/src/windows/native/sun/font/fontpath.c 2013-09-06 11:29:15.000000000 -0700
++++ jdk/src/windows/native/sun/font/fontpath.c 2014-04-20 12:39:22.000000000 -0700
+@@ -185,6 +185,12 @@
+ return 0;
+ }
+
++/* This HDC is initialised and released in the populate family map
++ * JNI entry point, and used within the call which would otherwise
++ * create many DCs.
++ */
++static HDC screenDC = NULL;
++
+ static int DifferentFamily(wchar_t *family, wchar_t* fullName) {
+ LOGFONTW lfw;
+ CheckFamilyInfo info;
+@@ -202,7 +208,7 @@
+ memset(&lfw, 0, sizeof(lfw));
+ wcscpy(lfw.lfFaceName, fullName);
+ lfw.lfCharSet = DEFAULT_CHARSET;
+- EnumFontFamiliesExW(GetDC(NULL), &lfw,
++ EnumFontFamiliesExW(screenDC, &lfw,
+ (FONTENUMPROCW)CheckFontFamilyProcW,
+ (LPARAM)(&info), 0L);
+
+@@ -299,7 +305,7 @@
+ memset(&lfa, 0, sizeof(lfa));
+ strcpy(lfa.lfFaceName, lpelfe->elfLogFont.lfFaceName);
+ lfa.lfCharSet = lpelfe->elfLogFont.lfCharSet;
+- EnumFontFamiliesExA(GetDC(NULL), &lfa,
++ EnumFontFamiliesExA(screenDC, &lfa,
+ (FONTENUMPROCA)EnumFontFacesInFamilyProcA,
+ lParam, 0L);
+ return 1;
+@@ -353,7 +359,7 @@
+ memset(&lfw, 0, sizeof(lfw));
+ wcscpy(lfw.lfFaceName, lpelfe->elfLogFont.lfFaceName);
+ lfw.lfCharSet = lpelfe->elfLogFont.lfCharSet;
+- EnumFontFamiliesExW(GetDC(NULL), &lfw,
++ EnumFontFamiliesExW(screenDC, &lfw,
+ (FONTENUMPROCW)EnumFontFacesInFamilyProcW,
+ lParam, 0L);
+ return 1;
+@@ -613,13 +619,17 @@
+ return;
+ }
+
++ screenDC = GetDC(NULL);
++ if (screenDC == NULL) {
++ return;
++ }
+ /* Enumerate fonts via GDI to build maps of fonts and families */
+ if (IS_NT) {
+ LOGFONTW lfw;
+ memset(&lfw, 0, sizeof(lfw));
+ lfw.lfCharSet = DEFAULT_CHARSET; /* all charsets */
+ wcscpy(lfw.lfFaceName, L""); /* one face per family (CHECK) */
+- EnumFontFamiliesExW(GetDC(NULL), &lfw,
++ EnumFontFamiliesExW(screenDC, &lfw,
+ (FONTENUMPROCW)EnumFamilyNamesW,
+ (LPARAM)(&fmi), 0L);
+ } else {
+@@ -627,7 +637,7 @@
+ memset(&lfa, 0, sizeof(lfa));
+ lfa.lfCharSet = DEFAULT_CHARSET; /* all charsets */
+ strcpy(lfa.lfFaceName, ""); /* one face per family */
+- ret = EnumFontFamiliesExA(GetDC(NULL), &lfa,
++ ret = EnumFontFamiliesExA(screenDC, &lfa,
+ (FONTENUMPROCA)EnumFamilyNamesA,
+ (LPARAM)(&fmi), 0L);
+ }
+@@ -637,6 +647,8 @@
+ ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+ fontKeyName, 0L, KEY_READ, &hkeyFonts);
+ if (ret != ERROR_SUCCESS) {
++ ReleaseDC(NULL, screenDC);
++ screenDC = NULL;
+ return;
+ }
+
+@@ -653,6 +665,8 @@
+ dwMaxValueNameLen >= MAX_BUFFER ||
+ dwMaxValueDataLen >= MAX_BUFFER) {
+ RegCloseKey(hkeyFonts);
++ ReleaseDC(NULL, screenDC);
++ screenDC = NULL;
+ return;
+ }
+ for (nval = 0; nval < dwNumValues; nval++ ) {
+@@ -692,4 +706,6 @@
+ }
+ }
+ RegCloseKey(hkeyFonts);
++ ReleaseDC(NULL, screenDC);
++ screenDC = NULL;
+ }
--- jdk/src/windows/native/sun/net/portconfig.c 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/src/windows/native/sun/net/portconfig.c 2014-01-18 12:16:22.000000000 -0800
++++ jdk/src/windows/native/sun/net/portconfig.c 2014-04-20 12:39:22.000000000 -0700
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -71319,8 +60749,77 @@
+#ifdef __cplusplus
+}
+#endif
+--- jdk/src/windows/native/sun/windows/awt_Toolkit.cpp 2013-09-06 11:29:17.000000000 -0700
++++ jdk/src/windows/native/sun/windows/awt_Toolkit.cpp 2014-04-20 12:39:22.000000000 -0700
+@@ -365,6 +365,7 @@
+ HANDLE hCompleted;
+
+ jobject thread;
++ jobject threadGroup;
+ };
+
+ void ToolkitThreadProc(void *param)
+@@ -377,7 +378,7 @@
+ JavaVMAttachArgs attachArgs;
+ attachArgs.version = JNI_VERSION_1_2;
+ attachArgs.name = "AWT-Windows";
+- attachArgs.group = NULL;
++ attachArgs.group = data->threadGroup;
+
+ jint res = jvm->AttachCurrentThreadAsDaemon((void **)&env, &attachArgs);
+ if (res < 0) {
+@@ -416,17 +417,18 @@
+ /*
+ * Class: sun_awt_windows_WToolkit
+ * Method: startToolkitThread
+- * Signature: (Ljava/lang/Runnable;)Z
++ * Signature: (Ljava/lang/Runnable;Ljava/lang/ThreadGroup)Z
+ */
+ JNIEXPORT jboolean JNICALL
+-Java_sun_awt_windows_WToolkit_startToolkitThread(JNIEnv *env, jclass cls, jobject thread)
++Java_sun_awt_windows_WToolkit_startToolkitThread(JNIEnv *env, jclass cls, jobject thread, jobject threadGroup)
+ {
+ AwtToolkit& tk = AwtToolkit::GetInstance();
+
+ ToolkitThreadProc_Data data;
+ data.result = false;
+ data.thread = env->NewGlobalRef(thread);
+- if (data.thread == NULL) {
++ data.threadGroup = env->NewGlobalRef(threadGroup);
++ if (data.thread == NULL || data.threadGroup == NULL) {
+ return JNI_FALSE;
+ }
+ data.hCompleted = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+@@ -444,6 +446,7 @@
+ ::CloseHandle(data.hCompleted);
+
+ env->DeleteGlobalRef(data.thread);
++ env->DeleteGlobalRef(data.threadGroup);
+
+ return result ? JNI_TRUE : JNI_FALSE;
+ }
+--- jdk/src/windows/resource/java.manifest 2013-09-06 11:29:17.000000000 -0700
++++ jdk/src/windows/resource/java.manifest 2014-04-20 12:39:22.000000000 -0700
+@@ -44,9 +44,15 @@
+ <!-- Indicate this JDK version is Windows 7 compatible -->
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
++ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
++ <!-- Windows 7 -->
++ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
++ <!-- Windows 8 -->
++ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
++ <!-- Windows 8.1 -->
++ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ </application>
+- </compatibility>
++ </compatibility>
+
+ </assembly>
--- jdk/test/Makefile 2013-09-06 11:29:17.000000000 -0700
-+++ jdk/test/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/Makefile 2014-04-20 12:39:16.000000000 -0700
@@ -79,6 +79,11 @@
endif
OS_VERSION := $(shell $(UNAME) -r)
@@ -71334,7 +60833,7 @@
OS_NAME = macosx
OS_ARCH := $(shell $(UNAME) -m)
--- jdk/test/ProblemList.txt 2013-09-06 11:29:17.000000000 -0700
-+++ jdk/test/ProblemList.txt 2014-01-18 12:16:22.000000000 -0800
++++ jdk/test/ProblemList.txt 2014-04-20 12:39:16.000000000 -0700
@@ -456,6 +456,9 @@
# 7041639, Solaris DSA keypair generation bug
java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
@@ -71346,7 +60845,7 @@
--- jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 2014-04-20 12:39:16.000000000 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -71410,7 +60909,7 @@
+ }
+}
--- jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 2014-01-18 12:16:22.000000000 -0800
++++ jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 2014-04-20 12:39:16.000000000 -0700
@@ -0,0 +1,420 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -71833,7 +61332,7 @@
+}
+
--- jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2013-09-06 11:29:18.000000000 -0700
-+++ jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2014-04-20 12:39:16.000000000 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -71844,7 +61343,7 @@
;;
--- jdk/test/com/sun/jdi/JITDebug.sh 2013-09-06 11:29:18.000000000 -0700
-+++ jdk/test/com/sun/jdi/JITDebug.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/jdi/JITDebug.sh 2014-04-20 12:39:16.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
export TRANSPORT_METHOD
@@ -71855,7 +61354,7 @@
TRANSPORT_METHOD=dt_socket
;;
--- jdk/test/com/sun/jdi/PrivateTransportTest.sh 2013-09-06 11:29:18.000000000 -0700
-+++ jdk/test/com/sun/jdi/PrivateTransportTest.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/jdi/PrivateTransportTest.sh 2014-04-20 12:39:16.000000000 -0700
@@ -123,7 +123,7 @@
esac
libloc=${jreloc}/lib/${libarch}
@@ -71866,7 +61365,7 @@
libloc=`dirname ${xx}`
;;
--- jdk/test/com/sun/jdi/ShellScaffold.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/jdi/ShellScaffold.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/jdi/ShellScaffold.sh 2014-04-20 12:39:16.000000000 -0700
@@ -293,7 +293,7 @@
psCmd=ps
jstack=jstack.exe
@@ -71877,7 +61376,7 @@
address=
devnull=/dev/null
--- jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2014-04-20 12:39:16.000000000 -0700
@@ -112,7 +112,7 @@
fi
;;
@@ -71888,7 +61387,7 @@
;;
--- jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2014-04-20 12:39:16.000000000 -0700
@@ -45,7 +45,7 @@
OS=`uname -s`
@@ -71899,7 +61398,7 @@
;;
Windows* | CYGWIN*)
--- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2014-04-20 12:39:16.000000000 -0700
@@ -72,6 +72,16 @@
done
}
@@ -71928,7 +61427,7 @@
# $ sysctl -n vm.swapusage
# total = 8192.00M used = 7471.11M free = 720.89M (encrypted)
--- jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2014-04-20 12:39:16.000000000 -0700
@@ -48,7 +48,7 @@
# Test GetMaxFileDescriptorCount if we are running on Unix
@@ -71939,7 +61438,7 @@
;;
* )
--- jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2013-09-06 11:29:19.000000000 -0700
-+++ jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2014-04-20 12:39:16.000000000 -0700
@@ -48,7 +48,7 @@
# Test GetOpenFileDescriptorCount if we are running on Unix
@@ -71950,7 +61449,7 @@
;;
* )
--- jdk/test/com/sun/tools/attach/CommonSetup.sh 2013-09-06 11:29:21.000000000 -0700
-+++ jdk/test/com/sun/tools/attach/CommonSetup.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/com/sun/tools/attach/CommonSetup.sh 2014-04-20 12:39:16.000000000 -0700
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -71961,7 +61460,7 @@
FS="/"
;;
--- jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2013-09-06 11:29:21.000000000 -0700
-+++ jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2014-01-18 12:16:24.000000000 -0800
++++ jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2014-04-20 12:39:16.000000000 -0700
@@ -1,6 +1,5 @@
<html>
-<!--
@@ -71984,7 +61483,7 @@
<title>Java 7 on mac os x only provides text clipboard formats</title>
</head>
--- jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2013-09-06 11:29:21.000000000 -0700
-+++ jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2014-04-20 12:39:16.000000000 -0700
@@ -22,17 +22,10 @@
*/
@@ -72007,8 +61506,172 @@
*/
import java.awt.*;
import java.awt.datatransfer.DataFlavor;
+--- jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,81 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++import java.awt.Color;
++import java.awt.Graphics2D;
++import java.awt.RenderingHints;
++import java.awt.image.BufferedImage;
++import java.io.File;
++import java.io.IOException;
++
++import javax.imageio.ImageIO;
++
++/**
++ * @test
++ * @bug 7190349
++ * @summary Verifies that we get correct direction, when draw rotated string.
++ * @author Sergey Bylokhov
++ * @run main/othervm DrawRotatedString
++ */
++public final class DrawRotatedString {
++
++ private static final int SIZE = 500;
++
++ public static void main(final String[] args) throws IOException {
++ BufferedImage bi = createBufferedImage(true);
++ verify(bi);
++ bi = createBufferedImage(false);
++ verify(bi);
++ System.out.println("Passed");
++ }
++
++ private static void verify(BufferedImage bi) throws IOException {
++ for (int i = 0; i < SIZE; ++i) {
++ for (int j = 0; j < 99; ++j) {
++ //Text should not appear before 100
++ if (bi.getRGB(i, j) != Color.RED.getRGB()) {
++ ImageIO.write(bi, "png", new File("image.png"));
++ throw new RuntimeException("Failed: wrong text location");
++ }
++ }
++ }
++ }
++
++ private static BufferedImage createBufferedImage(final boolean aa) {
++ final BufferedImage bi = new BufferedImage(SIZE, SIZE,
++ BufferedImage.TYPE_INT_RGB);
++ final Graphics2D bg = bi.createGraphics();
++ bg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
++ aa ? RenderingHints.VALUE_ANTIALIAS_ON
++ : RenderingHints.VALUE_ANTIALIAS_OFF);
++ bg.setColor(Color.RED);
++ bg.fillRect(0, 0, SIZE, SIZE);
++ bg.translate(100, 100);
++ bg.rotate(Math.toRadians(90));
++ bg.setColor(Color.BLACK);
++ bg.setFont(bg.getFont().deriveFont(20.0f));
++ bg.drawString("MMMMMMMMMMMMMMMM", 0, 0);
++ bg.dispose();
++ return bi;
++ }
++}
+--- jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,77 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++import java.awt.Color;
++import java.awt.Font;
++import java.awt.Graphics2D;
++import java.awt.image.BufferedImage;
++import java.io.File;
++import java.io.IOException;
++
++import javax.imageio.ImageIO;
++
++/**
++ * @test
++ * @bug 8013569
++ * @author Sergey Bylokhov
++ */
++public final class IncorrectTextSize {
++
++ static final int scale = 2;
++ static final int width = 1200;
++ static final int height = 100;
++ static BufferedImage bi = new BufferedImage(width, height,
++ BufferedImage.TYPE_INT_ARGB);
++ static final String TEXT = "The quick brown fox jumps over the lazy dog"
++ + "The quick brown fox jumps over the lazy dog";
++
++ public static void main(final String[] args) throws IOException {
++ for (int point = 5; point < 11; ++point) {
++ Graphics2D g2d = bi.createGraphics();
++ g2d.setFont(new Font(Font.DIALOG, Font.PLAIN, point));
++ g2d.scale(scale, scale);
++ g2d.setColor(Color.WHITE);
++ g2d.fillRect(0, 0, width, height);
++ g2d.setColor(Color.green);
++ g2d.drawString(TEXT, 0, 20);
++ int length = g2d.getFontMetrics().stringWidth(TEXT);
++ if (length < 0) {
++ throw new RuntimeException("Negative length");
++ }
++ for (int i = (length + 1) * scale; i < width; ++i) {
++ for (int j = 0; j < height; ++j) {
++ if (bi.getRGB(i, j) != Color.white.getRGB()) {
++ g2d.drawLine(length, 0, length, height);
++ ImageIO.write(bi, "png", new File("image.png"));
++ System.out.println("length = " + length);
++ System.err.println("Wrong color at x=" + i + ",y=" + j);
++ System.err.println("Color is:" + new Color(bi.getRGB(i,
++ j)));
++ throw new RuntimeException("Test failed.");
++ }
++ }
++ }
++ g2d.dispose();
++ }
++ }
++}
--- jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2013-09-06 11:29:24.000000000 -0700
-+++ jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2014-04-20 12:39:16.000000000 -0700
@@ -25,10 +25,11 @@
fi
@@ -72025,8 +61688,48 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
+--- jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,37 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/*
++ @test
++ @bug 8031477
++ @summary Crash while awt starting
++ @author Petr Pchelko
++ @run main/othervm LoadAWTCrashTest
++*/
++
++public class LoadAWTCrashTest {
++ public static void main(String[] args) {
++ System.loadLibrary("awt");
++ // If the bug is present JVM would crash or deadlock
++ }
++}
--- jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2013-09-06 11:29:24.000000000 -0700
-+++ jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2014-01-18 12:16:24.000000000 -0800
++++ jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2014-04-20 12:39:16.000000000 -0700
@@ -39,13 +39,10 @@
import java.util.Hashtable;
@@ -72045,8 +61748,108 @@
*/
public class KeyReleasedInAppletTest extends JApplet {
+--- jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ *
++ */
++
++/* @test
++ * @summary verify rendering of MORX fonts on OS X.
++ * @bug 8031462
++ */
++
++import javax.swing.*;
++import javax.swing.border.LineBorder;
++import java.awt.*;
++import java.awt.event.ActionEvent;
++
++public class TestAATMorxFont extends JComponent {
++ public static void main(String[] args) {
++ String osName = System.getProperty("os.name");
++ System.out.println("OS is " + osName);
++ osName = osName.toLowerCase();
++ if (!osName.startsWith("mac")) {
++ return;
++ }
++ SwingUtilities.invokeLater(new Runnable() {
++ public void run() {
++ JFrame frame = new JFrame("Test Morx");
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ TestAATMorxFont panel = new TestAATMorxFont();
++ frame.add(panel);
++ frame.pack();
++ frame.setVisible(true);
++ }
++ });
++ }
++
++ public Dimension getPreferredSize() {
++ return new Dimension(1200, 400);
++ }
++
++ public void paintComponent(Graphics g) {
++ Graphics2D g2d = (Graphics2D)g;
++ g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
++ RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
++ int y = 50;
++ g.setFont(new Font("Gujarati MT", Font.PLAIN, 40));
++ System.out.println(g.getFont());
++ g.drawString("\u0A95\u0ACD \u0A95\u0A95\u0A95 \u0A95\u0ACD\u0A95\u0ACD\u0A95", 20, y);
++ y += 50;
++ g.setFont(new Font("Tamil Sangam MN", Font.PLAIN, 40));
++ System.out.println(g.getFont());
++ g.drawString("\u0b95\u0bCD \u0b95\u0b95\u0b95 \u0b95\u0bCD\u0b95\u0bCD\u0b95", 20, y);
++ y += 50;
++ g.setFont(new Font("Telugu Sangam MN", Font.PLAIN, 40));
++ System.out.println(g.getFont());
++ g.drawString("\u0c15\u0c4D \u0c15\u0c15\u0c15 \u0c15\u0c4D\u0c15\u0c4D\u0c15", 20, y);
++ y += 50;
++ g.setFont(new Font("Devanagari Sangam MN", Font.PLAIN, 40));
++ System.out.println(g.getFont());
++ g.drawString("\u0915\u0940 \u0915\u0947 \u0915\u0942", 20, y);
++ y += 50;
++ g.drawString("\u0907\u0930\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915", 20, y);
++ y += 50;
++ g.drawString("\u0930\u093F\u0935\u094D\u092F\u0942 \u0915\u0947 \u092C\u093E\u0926 \u0935\u093F\u0915\u093E\u0938 \u0913\u0932\u0902\u092A\u093F\u0915 \u0938\u0947 \u092C\u093E\u0939\u0930 (\u0926\u0947\u0935\u0928\u093E\u0917\u0930\u0940) (\u0939\u093F\u0928\u094D\u0926\u0940) \u0907\u0930\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915\u094D\u0915", 20, y);
++
++ }
++}
++
+--- jdk/test/java/beans/Introspector/TestTypeResolver.java 2013-09-06 11:29:26.000000000 -0700
++++ jdk/test/java/beans/Introspector/TestTypeResolver.java 2014-04-20 12:39:16.000000000 -0700
+@@ -113,6 +113,8 @@
+ // by private implementations of the various Type interfaces
+ if (expect.equals(t) && t.equals(expect))
+ System.out.println(", as expected");
++ else if ((expect.equals(t) || t.equals(expect)) && expect.toString().equals(t.toString()))
++ System.out.println(", as workaround of the 8023301 bug");
+ else {
+ System.out.println(" BUT SHOULD BE " + expect);
+ failedCases.add(c);
--- jdk/test/java/io/File/GetXSpace.sh 2013-09-06 11:29:29.000000000 -0700
-+++ jdk/test/java/io/File/GetXSpace.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/java/io/File/GetXSpace.sh 2014-04-20 12:39:16.000000000 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
OS=`uname -s`
@@ -72057,7 +61860,7 @@
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
--- jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2013-09-06 11:29:29.000000000 -0700
-+++ jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2014-04-20 12:39:16.000000000 -0700
@@ -23,7 +23,7 @@
/*
@@ -72158,7 +61961,7 @@
}
}
--- jdk/test/java/io/FileOutputStream/ManyFiles.java 2013-09-06 11:29:29.000000000 -0700
-+++ jdk/test/java/io/FileOutputStream/ManyFiles.java 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/java/io/FileOutputStream/ManyFiles.java 2014-04-20 12:39:16.000000000 -0700
@@ -43,7 +43,7 @@
// Windows capability it is much simpler to only run it
// on that platform.
@@ -72169,7 +61972,7 @@
for (int n = 0; n < NUM_FILES; n++) {
--- jdk/test/java/io/IOException/LastErrorString.java 2013-09-06 11:29:29.000000000 -0700
-+++ jdk/test/java/io/IOException/LastErrorString.java 2013-12-01 11:14:28.000000000 -0800
++++ jdk/test/java/io/IOException/LastErrorString.java 2014-04-20 12:39:16.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
@@ -72188,7 +61991,7 @@
*/
--- jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2013-09-06 11:29:30.000000000 -0700
-+++ jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2014-04-20 12:39:16.000000000 -0700
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
# operating system.
@@ -72199,7 +62002,7 @@
Windows* | CYGWIN* )
PS=";" ;;
--- jdk/test/java/io/Serializable/serialver/classpath/run.sh 2013-09-06 11:29:31.000000000 -0700
-+++ jdk/test/java/io/Serializable/serialver/classpath/run.sh 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/java/io/Serializable/serialver/classpath/run.sh 2014-04-20 12:39:16.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -72210,7 +62013,7 @@
Windows* | CYGWIN* )
PS=";" ;;
--- jdk/test/java/io/Serializable/serialver/nested/run.sh 2013-09-06 11:29:31.000000000 -0700
-+++ jdk/test/java/io/Serializable/serialver/nested/run.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/io/Serializable/serialver/nested/run.sh 2014-04-20 12:39:16.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -72221,7 +62024,7 @@
Windows* | CYGWIN* )
PS=";" ;;
--- jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2013-09-06 11:29:32.000000000 -0700
-+++ jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2014-04-20 12:39:15.000000000 -0700
@@ -45,13 +45,7 @@
# set platform-specific variables
OS=`uname -s`
@@ -72238,7 +62041,7 @@
;;
Windows*)
--- jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2013-09-06 11:29:32.000000000 -0700
-+++ jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2014-04-20 12:39:15.000000000 -0700
@@ -49,13 +49,7 @@
# set platform-specific variables
OS=`uname -s`
@@ -72254,8 +62057,120 @@
FS="/"
;;
Windows* | CYGWIN* )
+--- jdk/test/java/lang/ProcessBuilder/Basic.java 2013-09-06 11:29:33.000000000 -0700
++++ jdk/test/java/lang/ProcessBuilder/Basic.java 2014-04-20 12:39:15.000000000 -0700
+@@ -29,6 +29,7 @@
+ * 4947220 7018606 7034570
+ * @summary Basic tests for Process and Environment Variable code
+ * @run main/othervm/timeout=300 Basic
++ * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
+ * @author Martin Buchholz
+ */
+
+--- jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 2014-04-20 12:39:15.000000000 -0700
+@@ -0,0 +1,99 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/*
++ * @test
++ * @bug 5049299
++ * @summary (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
++ * @compile BasicLauncher.java Basic.java
++ * @run main BasicLauncher
++ */
++
++import java.io.*;
++import java.nio.file.*;
++
++public class BasicLauncher {
++
++ private static boolean passed = false;
++
++ public static void main(String args[]) throws Exception {
++ String osName = System.getProperty("os.name");
++ if (osName.startsWith("SunOS")) {
++ BasicLauncher l = new BasicLauncher();
++ l.start();
++ }
++ }
++
++ private void start() throws Exception {
++ String separator = System.getProperty("file.separator");
++ String jdkpath = System.getProperty("test.jdk") + separator + "bin" + separator;
++ String srcpath = System.getProperty("test.src", ".") + separator;
++ String testClasses = System.getProperty("test.classes", ".");
++
++ ProcessBuilder builder = new ProcessBuilder(
++ jdkpath + "java",
++ "-cp",
++ testClasses,
++ "-Djdk.lang.Process.launchMechanism=posix_spawn",
++ "Basic");
++ builder.redirectErrorStream(true);
++ Process testProc = builder.start();
++ printProcessThread ppt =
++ new printProcessThread(testProc, "testproc");
++ ppt.start();
++ testProc.waitFor();
++ System.out.println("testproc done");
++
++ if (!passed)
++ throw new RuntimeException("Test Failed: ");
++ }
++
++
++ class printProcessThread extends Thread {
++ Process p;
++ String pName;
++
++ public printProcessThread(Process p, String pName) {
++ this.p = p;
++ this.pName = pName;
++ }
++
++ @Override
++ public void run() {
++ try (BufferedReader reader =
++ new BufferedReader(new InputStreamReader(p.getInputStream()))) {
++ String line;
++ while ((line = reader.readLine()) != null) {
++ System.out.println("[Output: " + pName + "]" + line);
++ if (line.contains("failed = 0")) {
++ passed = true;
++ }
++ }
++
++ } catch (Exception e) {
++ System.out.println("Exception encountered in " + pName
++ + " thread\n" + e);
++ }
++ }
++ }
++}
--- jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2013-09-06 11:29:33.000000000 -0700
-+++ jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2014-01-18 12:16:25.000000000 -0800
++++ jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2014-04-20 12:39:15.000000000 -0700
@@ -23,7 +23,7 @@
/*
@@ -72284,7 +62199,7 @@
"org.jcp.xml.dsig.internal.",
};
--- jdk/test/java/lang/StringCoding/CheckEncodings.sh 2013-09-06 11:29:33.000000000 -0700
-+++ jdk/test/java/lang/StringCoding/CheckEncodings.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/StringCoding/CheckEncodings.sh 2014-04-20 12:39:15.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -72295,7 +62210,7 @@
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
--- jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2013-09-06 11:29:34.000000000 -0700
-+++ jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2014-04-20 12:39:15.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -72306,7 +62221,7 @@
PS=":"
FS="/"
--- jdk/test/java/lang/instrument/MakeJAR2.sh 2013-09-06 11:29:34.000000000 -0700
-+++ jdk/test/java/lang/instrument/MakeJAR2.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/instrument/MakeJAR2.sh 2014-04-20 12:39:16.000000000 -0700
@@ -49,7 +49,7 @@
OS=`uname -s`
@@ -72317,7 +62232,7 @@
;;
--- jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2013-09-06 11:29:35.000000000 -0700
-+++ jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2014-04-20 12:39:15.000000000 -0700
@@ -35,15 +35,7 @@
OS=`uname -s`
@@ -72336,7 +62251,7 @@
FS="/"
;;
--- jdk/test/java/lang/invoke/MethodHandleConstants.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/java/lang/invoke/MethodHandleConstants.java 2013-12-01 11:14:29.000000000 -0800
++++ jdk/test/java/lang/invoke/MethodHandleConstants.java 2014-04-20 12:39:15.000000000 -0700
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -72527,7 +62442,7 @@
+ }
+}
--- jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2013-09-06 11:29:35.000000000 -0700
-+++ jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2014-04-20 12:39:15.000000000 -0700
@@ -61,7 +61,7 @@
while true; do
echo "Run $i: TestSystemLoadAvg"
@@ -72538,7 +62453,7 @@
;;
* )
--- jdk/test/java/net/Authenticator/B4933582.sh 2013-09-06 11:29:36.000000000 -0700
-+++ jdk/test/java/net/Authenticator/B4933582.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/Authenticator/B4933582.sh 2014-04-20 12:39:15.000000000 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -72549,7 +62464,7 @@
FS="/"
;;
--- jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2013-09-06 11:29:36.000000000 -0700
-+++ jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2014-04-20 12:39:15.000000000 -0700
@@ -45,6 +45,8 @@
return (true);
if (p.getProperty ("os.name").equals ("Linux"))
@@ -72560,7 +62475,7 @@
return (true);
// Check for specific Solaris version from here
--- jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2013-09-06 11:29:36.000000000 -0700
-+++ jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2014-04-20 12:39:15.000000000 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -72575,7 +62490,7 @@
FILESEP="/"
;;
--- jdk/test/java/net/Inet6Address/serialize/Serialize.java 2013-09-06 11:29:37.000000000 -0700
-+++ jdk/test/java/net/Inet6Address/serialize/Serialize.java 2013-12-01 11:14:30.000000000 -0800
++++ jdk/test/java/net/Inet6Address/serialize/Serialize.java 2014-04-20 12:39:15.000000000 -0700
@@ -94,7 +94,26 @@
} finally {
ois.close();
@@ -72769,7 +62684,7 @@
+ };
+}
--- jdk/test/java/net/Socket/OldSocketImpl.sh 2013-09-06 11:29:37.000000000 -0700
-+++ jdk/test/java/net/Socket/OldSocketImpl.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/Socket/OldSocketImpl.sh 2014-04-20 12:39:15.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -72780,7 +62695,7 @@
FS="/"
;;
--- jdk/test/java/net/URL/B5086147.sh 2013-09-06 11:29:38.000000000 -0700
-+++ jdk/test/java/net/URL/B5086147.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/URL/B5086147.sh 2014-04-20 12:39:15.000000000 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -72791,7 +62706,7 @@
;;
CYGWIN* )
--- jdk/test/java/net/URL/runconstructor.sh 2013-09-06 11:29:38.000000000 -0700
-+++ jdk/test/java/net/URL/runconstructor.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/URL/runconstructor.sh 2014-04-20 12:39:15.000000000 -0700
@@ -27,7 +27,7 @@
#
OS=`uname -s`
@@ -72802,7 +62717,7 @@
FS="/"
;;
--- jdk/test/java/net/URLClassLoader/B5077773.sh 2013-09-06 11:29:38.000000000 -0700
-+++ jdk/test/java/net/URLClassLoader/B5077773.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/URLClassLoader/B5077773.sh 2014-04-20 12:39:15.000000000 -0700
@@ -34,11 +34,7 @@
OS=`uname -s`
@@ -72817,7 +62732,7 @@
FS="/"
;;
--- jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2013-09-06 11:29:38.000000000 -0700
-+++ jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2014-04-20 12:39:15.000000000 -0700
@@ -27,11 +27,7 @@
OS=`uname -s`
@@ -72832,7 +62747,7 @@
FS="/"
;;
--- jdk/test/java/net/URLConnection/6212146/test.sh 2013-09-06 11:29:38.000000000 -0700
-+++ jdk/test/java/net/URLConnection/6212146/test.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/net/URLConnection/6212146/test.sh 2014-04-20 12:39:15.000000000 -0700
@@ -33,11 +33,7 @@
OS=`uname -s`
@@ -72847,7 +62762,7 @@
FS="/"
;;
--- jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2014-04-20 12:39:15.000000000 -0700
@@ -22,9 +22,10 @@
*/
@@ -72862,7 +62777,7 @@
*/
--- jdk/test/java/nio/channels/Selector/SelectorLimit.java 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/channels/Selector/SelectorLimit.java 2013-12-01 11:14:31.000000000 -0800
++++ jdk/test/java/nio/channels/Selector/SelectorLimit.java 2014-04-20 12:39:15.000000000 -0700
@@ -22,12 +22,13 @@
*/
@@ -72879,7 +62794,7 @@
import java.io.*;
--- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2014-04-20 12:39:15.000000000 -0700
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
endif
@@ -72930,7 +62845,7 @@
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
--- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2014-04-20 12:39:15.000000000 -0700
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -73000,7 +62915,7 @@
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
--- jdk/test/java/nio/charset/Charset/default.sh 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/charset/Charset/default.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/charset/Charset/default.sh 2014-04-20 12:39:15.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -73021,7 +62936,7 @@
JAVA=$TESTJAVA/bin/java
--- jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2014-04-20 12:39:15.000000000 -0700
@@ -34,7 +34,7 @@
OS=`uname -s`
@@ -73032,7 +62947,7 @@
Windows* )
echo "Passed"; exit 0 ;;
--- jdk/test/java/nio/charset/spi/basic.sh 2013-09-06 11:29:40.000000000 -0700
-+++ jdk/test/java/nio/charset/spi/basic.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/charset/spi/basic.sh 2014-04-20 12:39:15.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
shift
@@ -73062,7 +62977,7 @@
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
--- jdk/test/java/nio/file/FileSystem/Basic.java 2013-09-06 11:29:41.000000000 -0700
-+++ jdk/test/java/nio/file/FileSystem/Basic.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/file/FileSystem/Basic.java 2014-04-20 12:39:15.000000000 -0700
@@ -76,6 +76,8 @@
checkSupported(fs, "posix", "unix", "owner", "acl", "user");
if (os.equals("Linux"))
@@ -73073,7 +62988,7 @@
checkSupported(fs, "posix", "unix", "owner");
if (os.equals("Windows"))
--- jdk/test/java/nio/file/Files/CopyAndMove.java 2013-09-06 11:29:41.000000000 -0700
-+++ jdk/test/java/nio/file/Files/CopyAndMove.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/nio/file/Files/CopyAndMove.java 2014-04-20 12:39:15.000000000 -0700
@@ -634,7 +634,7 @@
// check POSIX attributes are copied
@@ -73093,7 +63008,7 @@
if (isUnix) {
--- jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2013-09-06 11:29:42.000000000 -0700
-+++ jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2014-04-20 12:39:15.000000000 -0700
@@ -88,6 +88,17 @@
TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT);
rmid.addOptions(new String[]{
@@ -73113,7 +63028,7 @@
/*
--- jdk/test/java/rmi/registry/readTest/readTest.sh 2013-09-06 11:29:43.000000000 -0700
-+++ jdk/test/java/rmi/registry/readTest/readTest.sh 2014-01-18 12:16:34.000000000 -0800
++++ jdk/test/java/rmi/registry/readTest/readTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -29,8 +29,12 @@
# @run shell readTest.sh
@@ -73190,7 +63105,7 @@
--- jdk/test/java/rmi/reliability/launch_reliability.ksh 2013-09-06 11:29:43.000000000 -0700
-+++ jdk/test/java/rmi/reliability/launch_reliability.ksh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/rmi/reliability/launch_reliability.ksh 2014-04-20 12:39:15.000000000 -0700
@@ -84,14 +84,12 @@
@@ -73211,7 +63126,7 @@
export PATH_SEP
mainpid=$$
--- jdk/test/java/rmi/testlibrary/TestLibrary.java 2013-09-06 11:29:44.000000000 -0700
-+++ jdk/test/java/rmi/testlibrary/TestLibrary.java 2014-01-18 12:16:28.000000000 -0800
++++ jdk/test/java/rmi/testlibrary/TestLibrary.java 2014-04-20 12:39:15.000000000 -0700
@@ -86,13 +86,13 @@
* FIXED_PORT_MIN or above FIXED_PORT_MAX, then adjust
* FIXED_PORT_MIN/MAX appropriately.
@@ -73234,7 +63149,7 @@
static void mesg(Object mesg) {
--- jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2013-09-06 11:29:45.000000000 -0700
-+++ jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73253,7 +63168,7 @@
FILESEP="/"
;;
--- jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2013-09-06 11:29:46.000000000 -0700
-+++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2014-04-20 12:39:15.000000000 -0700
@@ -34,15 +34,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73272,7 +63187,7 @@
FILESEP="/"
;;
--- jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2013-09-06 11:29:46.000000000 -0700
-+++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2014-04-20 12:39:15.000000000 -0700
@@ -50,19 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73295,7 +63210,7 @@
FILESEP="/"
;;
--- jdk/test/java/security/Security/signedfirst/Dyn.sh 2013-09-06 11:29:46.000000000 -0700
-+++ jdk/test/java/security/Security/signedfirst/Dyn.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/security/Security/signedfirst/Dyn.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73314,7 +63229,7 @@
FILESEP="/"
;;
--- jdk/test/java/security/Security/signedfirst/Static.sh 2013-09-06 11:29:46.000000000 -0700
-+++ jdk/test/java/security/Security/signedfirst/Static.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/security/Security/signedfirst/Static.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73333,7 +63248,7 @@
FILESEP="/"
;;
--- jdk/test/java/util/Currency/PropertiesTest.sh 2013-09-06 11:29:47.000000000 -0700
-+++ jdk/test/java/util/Currency/PropertiesTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/util/Currency/PropertiesTest.sh 2014-04-20 12:39:16.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73344,7 +63259,7 @@
FS="/"
;;
--- jdk/test/java/util/PluggableLocale/ExecTest.sh 2013-09-06 11:29:48.000000000 -0700
-+++ jdk/test/java/util/PluggableLocale/ExecTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/util/PluggableLocale/ExecTest.sh 2014-04-20 12:39:16.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73355,7 +63270,7 @@
FS="/"
;;
--- jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2013-09-06 11:29:49.000000000 -0700
-+++ jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2014-04-20 12:39:16.000000000 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73366,7 +63281,7 @@
FILESEP="/"
;;
--- jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2013-09-06 11:29:49.000000000 -0700
-+++ jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2014-04-20 12:39:16.000000000 -0700
@@ -72,10 +72,10 @@
Windows* | CYGWIN* )
DEL=";"
@@ -73381,7 +63296,7 @@
HAS_S=YES
;;
--- jdk/test/java/util/ServiceLoader/basic.sh 2013-09-06 11:29:50.000000000 -0700
-+++ jdk/test/java/util/ServiceLoader/basic.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/java/util/ServiceLoader/basic.sh 2014-04-20 12:39:16.000000000 -0700
@@ -42,9 +42,7 @@
OS=`uname -s`
@@ -73393,8 +63308,210 @@
SEP=':' ;;
* )
SEP='\;' ;;
+--- jdk/test/java/util/logging/TestAppletLoggerContext.java 2013-09-06 11:29:51.000000000 -0700
++++ jdk/test/java/util/logging/TestAppletLoggerContext.java 2014-04-20 12:39:16.000000000 -0700
+@@ -110,28 +110,19 @@
+ }
+
+ TestExc exc;
+- TestExc global = new TestExc();
+
+ @Override
+- public Object getContext() { return active ? global : null; }
++ public Object getAppletContext() { return active ? exc : null; }
+ @Override
+- public Object getExecutionContext() { return active ? exc : null; }
++ public Object get(Object o) { return exc.get(o); }
+ @Override
+- public Object get(Object o, Object o1) { return TestExc.exc(o).get(o1); }
++ public void put(Object o, Object o1) { exc.put(o, o1); }
+ @Override
+- public void put(Object o, Object o1, Object o2) { TestExc.exc(o).put(o1, o2); }
+- @Override
+- public void remove(Object o, Object o1) { TestExc.exc(o).remove(o1); }
+- @Override
+- public Object get(Object o) { return global.get(o); }
+- @Override
+- public void put(Object o, Object o1) { global.put(o, o1); }
+- @Override
+- public void remove(Object o) { global.remove(o); }
++ public void remove(Object o) { exc.remove(o); }
+ @Override
+ public boolean isDisposed() { return false; }
+ @Override
+- public boolean isMainAppContext() { return exc == null; }
++ public boolean isMainAppContext() { return !active || exc == null; }
+ }
+
+ final static JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
+--- jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,75 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++import java.io.ByteArrayInputStream;
++import java.io.IOException;
++import java.util.logging.Logger;
++import javax.imageio.ImageIO;
++
++/**
++ * @test
++ * @bug 8019853 8023258
++ * @summary Test that the default user context is used when in the main
++ * application context. This test must not be run in same VM or agent
++ * VM mode: it would not test the intended behavior.
++ * @run main/othervm TestLoggingWithMainAppContext
++ */
++public class TestLoggingWithMainAppContext {
++
++ public static void main(String[] args) throws IOException {
++ System.out.println("Creating loggers.");
++
++ // These loggers will be created in the default user context.
++ final Logger foo1 = Logger.getLogger( "foo" );
++ final Logger bar1 = Logger.getLogger( "foo.bar" );
++ if (bar1.getParent() != foo1) {
++ throw new RuntimeException("Parent logger of bar1 "+bar1+" is not "+foo1);
++ }
++ System.out.println("bar1.getParent() is the same as foo1");
++
++ // Set a security manager
++ System.setSecurityManager(new SecurityManager());
++ System.out.println("Now running with security manager");
++
++ // Triggers the creation of the main AppContext
++ ByteArrayInputStream is = new ByteArrayInputStream(new byte[] { 0, 1 });
++ ImageIO.read(is); // triggers calls to system loggers & creation of main AppContext
++
++ // verify that we're still using the default user context
++ final Logger bar2 = Logger.getLogger( "foo.bar" );
++ if (bar1 != bar2) {
++ throw new RuntimeException("bar2 "+bar2+" is not the same as bar1 "+bar1);
++ }
++ System.out.println("bar2 is the same as bar1");
++ if (bar2.getParent() != foo1) {
++ throw new RuntimeException("Parent logger of bar2 "+bar2+" is not foo1 "+foo1);
++ }
++ System.out.println("bar2.getParent() is the same as foo1");
++ final Logger foo2 = Logger.getLogger("foo");
++ if (foo1 != foo2) {
++ throw new RuntimeException("foo2 "+foo2+" is not the same as foo1 "+foo1);
++ }
++ System.out.println("foo2 is the same as foo1");
++
++ System.out.println("Test passed.");
++ }
++}
+--- jdk/test/java/util/logging/TestMainAppContext.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/java/util/logging/TestMainAppContext.java 2014-04-20 12:39:16.000000000 -0700
+@@ -0,0 +1,85 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++import java.util.logging.Logger;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
++
++
++/**
++ * @test
++ * @bug 8026404
++ * @summary checks that calling getLogger() from a Thread whose ThreadGroup is
++ * a child of the main root group doesn't throw an exception.
++ * @build TestMainAppContext
++ * @run main/othervm TestMainAppContext
++ * @author danielfuchs
++ */
++public class TestMainAppContext {
++
++ static volatile Throwable thrown = null;
++
++ public static void main(String... args) throws Exception {
++ ThreadGroup rootTG = Thread.currentThread().getThreadGroup();
++ while (rootTG.getParent() != null) {
++ rootTG = rootTG.getParent();
++ }
++
++ ThreadGroup tg = new ThreadGroup(rootTG, "FakeApplet");
++ final Thread t1 = new Thread(tg, "createNewAppContext") {
++ @Override
++ public void run() {
++ try {
++ AppContext context = SunToolkit.createNewAppContext();
++ } catch(Throwable t) {
++ thrown = t;
++ }
++ }
++ };
++ t1.start();
++ t1.join();
++ if (thrown != null) {
++ throw new RuntimeException("Unexpected exception: " + thrown, thrown);
++ }
++ Thread t2 = new Thread(tg, "BugDetector") {
++
++ @Override
++ public void run() {
++ try {
++ Logger.getLogger("foo").info("Done");
++ } catch (Throwable x) {
++ thrown = x;
++ }
++ }
++
++ };
++
++ System.setSecurityManager(new SecurityManager());
++ t2.start();
++ t2.join();
++ if (thrown != null) {
++ throw new RuntimeException("Test failed: " + thrown, thrown);
++ }
++
++ }
++
++}
--- jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2013-09-06 11:29:52.000000000 -0700
-+++ jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -51,7 +51,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73405,7 +63522,7 @@
PS=":"
FS="/"
--- jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2013-09-06 11:29:52.000000000 -0700
-+++ jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2014-04-20 12:39:15.000000000 -0700
@@ -23,7 +23,7 @@
/**
@@ -73415,8 +63532,70 @@
* @summary Test verifies that jpeg writer instances are collected
* even if destroy() or reset() methods is not invoked.
*
+--- jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java 1969-12-31 16:00:00.000000000 -0800
++++ jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java 2014-04-20 12:39:15.000000000 -0700
+@@ -0,0 +1,58 @@
++/*
++ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++import java.io.File;
++import java.io.IOException;
++import javax.imageio.ImageIO;
++import javax.imageio.ImageReader;
++import javax.imageio.event.IIOReadWarningListener;
++import javax.imageio.stream.ImageInputStream;
++
++public class TruncatedImageWarningTest implements IIOReadWarningListener {
++
++ private static String fileName = "truncated.jpg";
++ boolean receivedWarning = false;
++
++ public static void main(String[] args) throws IOException {
++
++ String sep = System.getProperty("file.separator");
++ String dir = System.getProperty("test.src", ".");
++ String filePath = dir+sep+fileName;
++ System.out.println("Test file: " + filePath);
++ File f = new File(filePath);
++ ImageInputStream in = ImageIO.createImageInputStream(f);
++ ImageReader reader = ImageIO.getImageReaders(in).next();
++ TruncatedImageWarningTest twt = new TruncatedImageWarningTest();
++ reader.addIIOReadWarningListener(twt);
++ reader.setInput(in);
++ reader.read(0);
++ if (!twt.receivedWarning) {
++ throw new RuntimeException("No expected warning");
++ }
++ }
++
++ public void warningOccurred(ImageReader source, String warning) {
++ System.out.println("Expected warning: " + warning);
++ receivedWarning = true;
++ }
++}
+Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg differ
--- jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2013-09-06 11:29:52.000000000 -0700
-+++ jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2014-04-20 12:39:15.000000000 -0700
@@ -84,7 +84,7 @@
TMP="/tmp"
;;
@@ -73442,7 +63621,7 @@
VAR="A different value for Win32"
DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
--- jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2013-09-06 11:29:54.000000000 -0700
-+++ jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2013-12-01 11:14:33.000000000 -0800
++++ jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2014-04-20 12:39:15.000000000 -0700
@@ -23,7 +23,7 @@
/*
@@ -73453,7 +63632,7 @@
* @author Eamonn McManus
* @run clean MissingClassTest SingleClassLoader
--- jdk/test/javax/script/CommonSetup.sh 2013-09-06 11:29:55.000000000 -0700
-+++ jdk/test/javax/script/CommonSetup.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/javax/script/CommonSetup.sh 2014-04-20 12:39:15.000000000 -0700
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -73464,7 +63643,7 @@
FS="/"
;;
--- jdk/test/javax/script/GetInterfaceTest.java 2013-09-06 11:29:55.000000000 -0700
-+++ jdk/test/javax/script/GetInterfaceTest.java 2014-01-18 12:16:29.000000000 -0800
++++ jdk/test/javax/script/GetInterfaceTest.java 2014-04-20 12:39:15.000000000 -0700
@@ -67,11 +67,11 @@
foo2.bar2();
}
@@ -73480,7 +63659,7 @@
}
}
--- jdk/test/javax/security/auth/Subject/doAs/Test.sh 2013-09-06 11:29:55.000000000 -0700
-+++ jdk/test/javax/security/auth/Subject/doAs/Test.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/javax/security/auth/Subject/doAs/Test.sh 2014-04-20 12:39:15.000000000 -0700
@@ -33,17 +33,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73501,7 +63680,7 @@
FS="/"
RM="/bin/rm -f"
--- jdk/test/jprt.config 2013-09-06 11:30:01.000000000 -0700
-+++ jdk/test/jprt.config 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/jprt.config 2014-04-20 12:39:16.000000000 -0700
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -73570,7 +63749,7 @@
# Export PATH setting
PATH="${path4sdk}"
--- jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2013-09-06 11:30:01.000000000 -0700
-+++ jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2014-04-20 12:39:16.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73581,7 +63760,7 @@
PS=":"
FS="/"
--- jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2013-09-06 11:30:02.000000000 -0700
-+++ jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -45,37 +45,53 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
#{
@@ -73662,7 +63841,7 @@
#
--- jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2013-09-06 11:30:02.000000000 -0700
-+++ jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2014-04-20 12:39:15.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -73673,7 +63852,7 @@
FILESEP="/"
DFILESEP=$FILESEP
--- jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2013-09-06 11:30:02.000000000 -0700
-+++ jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -73692,7 +63871,7 @@
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
--- jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2013-09-06 11:30:02.000000000 -0700
-+++ jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -70,10 +70,12 @@
# security the password file.
@@ -73711,7 +63890,7 @@
# Create configuration file and dummy password file
--- jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2013-09-06 11:30:02.000000000 -0700
-+++ jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -69,10 +69,12 @@
# security the password file.
@@ -73730,7 +63909,7 @@
# Create management and SSL configuration files
--- jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2013-09-06 11:30:03.000000000 -0700
-+++ jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -73741,7 +63920,7 @@
FS="/"
;;
--- jdk/test/sun/net/www/MarkResetTest.sh 2013-09-06 11:30:03.000000000 -0700
-+++ jdk/test/sun/net/www/MarkResetTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/net/www/MarkResetTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -73752,7 +63931,7 @@
FS="/"
;;
--- jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2013-09-06 11:30:04.000000000 -0700
-+++ jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2014-04-20 12:39:15.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -73763,7 +63942,7 @@
FS="/"
;;
--- jdk/test/sun/net/www/protocol/jar/B5105410.sh 2013-09-06 11:30:04.000000000 -0700
-+++ jdk/test/sun/net/www/protocol/jar/B5105410.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/net/www/protocol/jar/B5105410.sh 2014-04-20 12:39:15.000000000 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -73774,7 +63953,7 @@
FS="/"
;;
--- jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2013-09-06 11:30:04.000000000 -0700
-+++ jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2014-04-20 12:39:15.000000000 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -73785,7 +63964,7 @@
FS="/"
;;
--- jdk/test/sun/nio/ch/SelProvider.java 2013-09-06 11:30:04.000000000 -0700
-+++ jdk/test/sun/nio/ch/SelProvider.java 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/nio/ch/SelProvider.java 2014-04-20 12:39:14.000000000 -0700
@@ -39,7 +39,7 @@
expected = "sun.nio.ch.DevPollSelectorProvider";
} else if ("Linux".equals(osname)) {
@@ -73796,7 +63975,7 @@
} else {
return;
--- jdk/test/sun/security/krb5/runNameEquals.sh 2013-09-06 11:30:07.000000000 -0700
-+++ jdk/test/sun/security/krb5/runNameEquals.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/krb5/runNameEquals.sh 2014-04-20 12:39:15.000000000 -0700
@@ -48,15 +48,11 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73815,7 +63994,7 @@
PATHSEP=";"
FILESEP="/"
--- jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2013-09-06 11:30:07.000000000 -0700
-+++ jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2014-04-20 12:39:15.000000000 -0700
@@ -131,6 +131,27 @@
;;
esac
@@ -73845,7 +64024,7 @@
FS="\\"
PS=";"
--- jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2013-09-06 11:30:07.000000000 -0700
-+++ jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2014-04-20 12:39:15.000000000 -0700
@@ -93,6 +93,27 @@
;;
esac
@@ -73875,7 +64054,7 @@
FS="\\"
PS=";"
--- jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2013-09-06 11:30:08.000000000 -0700
-+++ jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2014-04-20 12:39:15.000000000 -0700
@@ -50,19 +50,7 @@
OS=`uname -s`
@@ -73898,7 +64077,7 @@
PS=":"
CP="${FS}bin${FS}cp"
--- jdk/test/sun/security/pkcs11/Provider/Login.sh 2013-09-06 11:30:08.000000000 -0700
-+++ jdk/test/sun/security/pkcs11/Provider/Login.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/pkcs11/Provider/Login.sh 2014-04-20 12:39:15.000000000 -0700
@@ -51,19 +51,7 @@
OS=`uname -s`
@@ -73921,7 +64100,7 @@
PS=":"
CP="${FS}bin${FS}cp"
--- jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 2014-01-18 12:16:31.000000000 -0800
++++ jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 2014-04-20 12:39:15.000000000 -0700
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -74334,7 +64513,7 @@
+}
+
--- jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2013-09-06 11:30:09.000000000 -0700
-+++ jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2014-04-20 12:39:15.000000000 -0700
@@ -44,11 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74349,7 +64528,7 @@
FILESEP="/"
;;
--- jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2013-09-06 11:30:09.000000000 -0700
-+++ jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2014-04-20 12:39:15.000000000 -0700
@@ -47,15 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74368,7 +64547,7 @@
FS="/"
;;
--- jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2013-09-06 11:30:10.000000000 -0700
-+++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2014-04-20 12:39:15.000000000 -0700
@@ -33,7 +33,7 @@
OS=`uname -s`
@@ -74379,7 +64558,7 @@
FS="/"
;;
--- jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2013-09-06 11:30:11.000000000 -0700
-+++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -42,7 +42,7 @@
OS=`uname -s`
@@ -74390,7 +64569,7 @@
PATHSEP=":"
;;
--- jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2014-04-20 12:39:15.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -74401,7 +64580,7 @@
FS="/"
;;
--- jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2014-04-20 12:39:15.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -74412,7 +64591,7 @@
FS="/"
;;
--- jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74423,7 +64602,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74434,7 +64613,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2014-01-18 12:16:31.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2014-04-20 12:39:15.000000000 -0700
@@ -242,13 +242,13 @@
" -J-Djava.security.egd=file:/dev/./urandom" +
" -debug -keystore " + TSKS + " -storepass changeit" +
@@ -74487,7 +64666,7 @@
}
}
--- jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2014-01-18 12:16:31.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2014-04-20 12:39:15.000000000 -0700
@@ -136,7 +136,6 @@
# 16 and 32 already covered in the first part
# ==========================================================
@@ -74507,7 +64686,7 @@
[ $? = 4 ] || exit $LINENO
--- jdk/test/sun/security/tools/jarsigner/diffend.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/diffend.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/diffend.sh 2014-04-20 12:39:15.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74518,7 +64697,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/jarsigner/oldsig.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/oldsig.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/oldsig.sh 2014-04-20 12:39:15.000000000 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74529,7 +64708,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/jarsigner/ts.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/jarsigner/ts.sh 2014-01-18 12:16:31.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/ts.sh 2014-04-20 12:39:15.000000000 -0700
@@ -22,7 +22,7 @@
#
@@ -74549,7 +64728,7 @@
rm tsks
echo Nothing > A
--- jdk/test/sun/security/tools/jarsigner/warnings.sh 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/sun/security/tools/jarsigner/warnings.sh 2014-01-18 12:16:31.000000000 -0800
++++ jdk/test/sun/security/tools/jarsigner/warnings.sh 2014-04-20 12:39:15.000000000 -0700
@@ -0,0 +1,119 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -74671,7 +64850,7 @@
+
+
--- jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74682,7 +64861,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2014-04-20 12:39:15.000000000 -0700
@@ -47,15 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74701,7 +64880,7 @@
FILESEP="/"
;;
--- jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2014-04-20 12:39:15.000000000 -0700
@@ -42,13 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74718,7 +64897,7 @@
;;
CYGWIN* )
--- jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2014-04-20 12:39:15.000000000 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74729,7 +64908,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74740,7 +64919,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/keytool/autotest.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/autotest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/autotest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -72,6 +72,27 @@
;;
esac
@@ -74770,7 +64949,7 @@
echo "Will not run test on: ${OS}"
exit 0;
--- jdk/test/sun/security/tools/keytool/i18n.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/i18n.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/i18n.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74781,7 +64960,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/keytool/printssl.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/printssl.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/printssl.sh 2014-04-20 12:39:15.000000000 -0700
@@ -37,7 +37,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74792,7 +64971,7 @@
;;
CYGWIN* )
--- jdk/test/sun/security/tools/keytool/resource.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/resource.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/resource.sh 2014-04-20 12:39:15.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74803,7 +64982,7 @@
FS="/"
;;
--- jdk/test/sun/security/tools/keytool/standard.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/keytool/standard.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/keytool/standard.sh 2014-04-20 12:39:15.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74814,7 +64993,7 @@
;;
Windows_* )
--- jdk/test/sun/security/tools/policytool/Alias.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/Alias.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/Alias.sh 2014-04-20 12:39:15.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74825,7 +65004,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/ChangeUI.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/ChangeUI.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/ChangeUI.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74836,7 +65015,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74847,7 +65026,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/SaveAs.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/SaveAs.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/SaveAs.sh 2014-04-20 12:39:15.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74858,7 +65037,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74869,7 +65048,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/UsePolicy.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/UsePolicy.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/UsePolicy.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74880,7 +65059,7 @@
PS=":"
FS="/"
--- jdk/test/sun/security/tools/policytool/i18n.sh 2013-09-06 11:30:12.000000000 -0700
-+++ jdk/test/sun/security/tools/policytool/i18n.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/security/tools/policytool/i18n.sh 2014-04-20 12:39:15.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -74891,7 +65070,7 @@
PS=":"
FS="/"
--- jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 1969-12-31 16:00:00.000000000 -0800
-+++ jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -0,0 +1,111 @@
+#
+# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -75005,7 +65184,7 @@
+ else fail "unspecified test failure"
+fi
--- jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2013-09-06 11:30:13.000000000 -0700
-+++ jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -54,7 +54,7 @@
OS=`uname -s`
@@ -75016,7 +65195,7 @@
;;
--- jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2013-09-06 11:30:14.000000000 -0700
-+++ jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2014-04-20 12:39:15.000000000 -0700
@@ -33,7 +33,7 @@
case `uname -s` in
@@ -75027,7 +65206,7 @@
N2A=$TESTJAVA/bin/native2ascii
--- jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2013-09-06 11:30:14.000000000 -0700
-+++ jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2014-01-18 12:16:33.000000000 -0800
++++ jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2014-04-20 12:39:15.000000000 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -75038,7 +65217,7 @@
;;
--- jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2013-09-06 11:30:14.000000000 -0700
-+++ jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2014-01-18 12:16:32.000000000 -0800
++++ jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2014-04-20 12:39:15.000000000 -0700
@@ -130,12 +130,12 @@
"(New South Wales)\"");
tzLocale = locales2Test[1];
@@ -75129,7 +65308,7 @@
}
}
--- langtools/.hgtags 2013-09-06 11:31:03.000000000 -0700
-+++ langtools/.hgtags 2014-01-18 12:16:11.000000000 -0800
++++ langtools/.hgtags 2014-04-20 12:39:14.000000000 -0700
@@ -123,6 +123,7 @@
9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
@@ -75161,7 +65340,7 @@
28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
-@@ -343,3 +360,38 @@
+@@ -343,3 +360,59 @@
765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
@@ -75187,6 +65366,9 @@
+ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
+164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
+7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
++ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
++bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
++efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
+18d1864abca976ca68cb71612e9b20c908455d3d jdk7u51-b00
+14d1cf2630aea549cfba9d052200c7ebcabd875c jdk7u51-b01
+f0168ccf171ed6080267fe0a7f7aed0b46bd5713 jdk7u51-b02
@@ -75200,8 +65382,44 @@
+7e33fc6adc82176a459e6702ae03a34f789b88ec jdk7u51-b10
+c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
+5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
++4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
++ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
++e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
++5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u55-b00
++3e64e49131b88c839733c9869ff8aebcd15cf828 jdk7u55-b01
++2a9f5c00ba46f895bc9d16a584bf7d80c1822268 jdk7u55-b02
++0479d260ac835eb3f0c7f3d7d15be0599b92a20a jdk7u55-b03
++a244cc40ae0b29028ff8503ee516cb5f9e3db6e3 jdk7u55-b04
++25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u55-b05
++76eeeaace70d38795eef5215f758493421cee0ac jdk7u55-b06
++08f7914d6aa947e73269b4e60110ed12573ffa28 jdk7u55-b07
++e64301b473b43609cb28d8cfe7e5db17d9bf8a4a jdk7u55-b08
++a296112a3fd774c258375912c7ada38daf8eee1e jdk7u55-b09
++faa9f8c51a6e3fcb444729012a798e3ad09c3da4 jdk7u55-b10
++2bdd105e433da7fbf7f37ec2f75fc4bed4e54280 jdk7u55-b11
++a3cdca5d3773f67a49091f9131a4d073bc6b83d9 jdk7u55-b12
++81bf1ca3a3a71c628b7d952ba47c6f200a223f27 jdk7u55-b13
++96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30
+--- langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java 2013-09-06 11:31:06.000000000 -0700
++++ langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java 2014-04-20 12:39:08.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -235,7 +235,7 @@
+ } else if (opt.equals("-doctitle")) {
+ doctitle = os[1];
+ } else if (opt.equals("-windowtitle")) {
+- windowtitle = os[1];
++ windowtitle = os[1].replaceAll("\\<.*?>", "");
+ } else if (opt.equals("-top")) {
+ top = os[1];
+ } else if (opt.equals("-bottom")) {
--- langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2013-09-06 11:31:06.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2013-12-01 11:13:46.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2014-04-20 12:39:08.000000000 -0700
@@ -292,7 +292,7 @@
script.addAttr(HtmlAttr.TYPE, "text/javascript");
String scriptCode = "<!--" + DocletConstants.NL +
@@ -75266,7 +65484,7 @@
*
* @return a content for the SCRIPT tag
--- langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2013-09-06 11:31:06.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2014-01-18 12:16:11.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2014-04-20 12:39:08.000000000 -0700
@@ -180,6 +180,6 @@
doclet.0_and_1={0}\u3068{1}
@@ -75277,7 +65495,7 @@
-doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408
+doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name \u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException \u5F15\u6570\u304Cnull\u306E\u5834\u5408
--- langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2013-09-06 11:31:06.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2014-01-18 12:16:11.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2014-04-20 12:39:08.000000000 -0700
@@ -182,4 +182,4 @@
#Documentation for Enums
doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n<pre>\nfor ({0} c : {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return \u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
@@ -75285,7 +65503,7 @@
-doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@throws \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@throws \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
+doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@throws IllegalArgumentException \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@throws NullPointerException \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
--- langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2013-09-06 11:31:07.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2013-12-01 11:13:46.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2014-04-20 12:39:08.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -75376,7 +65594,7 @@
}
--- langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2013-09-06 11:31:07.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2014-01-18 12:16:11.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2014-04-20 12:39:08.000000000 -0700
@@ -555,19 +555,19 @@
# 0: name
compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059
@@ -75411,7 +65629,7 @@
# 0: symbol
compiler.misc.diamond={0}<>
--- langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2013-09-06 11:31:08.000000000 -0700
-+++ langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2014-01-18 12:16:11.000000000 -0800
++++ langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2014-04-20 12:39:08.000000000 -0700
@@ -90,7 +90,7 @@
err.prefix=\u30A8\u30E9\u30FC:
err.cant.use.option.for.fm=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
@@ -75422,7 +65640,7 @@
err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
--- langtools/test/Makefile 2013-09-06 11:31:11.000000000 -0700
-+++ langtools/test/Makefile 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/Makefile 2014-04-20 12:39:11.000000000 -0700
@@ -42,6 +42,14 @@
ARCH=i586
endif
@@ -75459,10 +65677,10 @@
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
--- langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 1969-12-31 16:00:00.000000000 -0800
-+++ langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 2013-12-01 11:13:46.000000000 -0800
-@@ -0,0 +1,82 @@
++++ langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 2014-04-20 12:39:09.000000000 -0700
+@@ -0,0 +1,216 @@
+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
@@ -75486,7 +65704,7 @@
+
+/*
+ * @test
-+ * @bug 8016675
++ * @bug 8016675 8026736
+ * @summary Test for window title.
+ * @author Bhavesh Patel
+ * @library ../lib/
@@ -75497,26 +65715,153 @@
+public class TestWindowTitle extends JavadocTester {
+
+ private static final String BUG_ID = "8016675";
-+ private static final String WIN_TITLE =
++ //Window title with JavaScript special characters.
++ private static final String TITLE_JS_CHARS =
+ "Testing \"Window 'Title'\" with a \\ backslash and a / " +
+ "forward slash and a \u00e8 unicode char also a tab and also a " +
+ "\t special character another \u0002 unicode)";
-+ private static final String[][] TEST = {
-+ {BUG_ID + FS + "overview-summary.html",
++ private static final String[] ARGS_JS_CHARS = new String[]{
++ "-d", BUG_ID + "-1", "-windowtitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_JS_CHARS = {
++ {BUG_ID + "-1" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
+ "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
+ "also a tab and also a \\t special character another \\u0002 unicode))\";"
+ },
+ };
-+ private static final String[][] NEG_TEST = {
-+ {BUG_ID + FS + "overview-summary.html",
++ private static final String[][] NEG_TEST_JS_CHARS = {
++ {BUG_ID + "-1" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing \"Window \'Title\'\" " +
+ "with a \\ backslash and a / forward slash and a \u00E8 unicode char " +
+ "also a tab and also a \t special character another \u0002 unicode))\";"
++ }
++ };
++
++ //Window title with a script tag.
++ private static final String TITLE_SCRIPT_TAG =
++ "Testing script tag in title </title><script>alert(\"Should not pop up\")</script>.";
++ private static final String[] ARGS_SCRIPT_TAG = new String[]{
++ "-d", BUG_ID + "-2", "-windowtitle", TITLE_SCRIPT_TAG, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_SCRIPT_TAG = {
++ {BUG_ID + "-2" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing script tag in title alert" +
++ "(\\\"Should not pop up\\\").)\";"
++ },
++ {BUG_ID + "-2" + FS + "p2" + FS + "C2.html",
++ "parent.document.title=\"C2 (Testing script tag in title alert" +
++ "(\\\"Should not pop up\\\").)\";"
++ }
++ };
++ private static final String[][] NEG_TEST_SCRIPT_TAG = {
++ {BUG_ID + "-2" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing script tag in title </title><script>" +
++ "alert(\\\"Should not pop up\\\")</script>.)\";"
+ },
++ {BUG_ID + "-2" + FS + "p2" + FS + "C2.html",
++ "parent.document.title=\"C2 (Testing script tag in title </title><script>" +
++ "alert(\\\"Should not pop up\\\")</script>.)\";"
++ }
++ };
++
++ //Window title with other HTML tags.
++ private static final String TITLE_HTML_TAGS =
++ "Testing another <p>HTML</p> tag. Another <h1>tag</h1>. A " +
++ "<span id=\"testTag\">tag with attributes</span>. <script and </p are not tags.";
++ private static final String[] ARGS_HTML_TAGS = new String[]{
++ "-d", BUG_ID + "-3", "-windowtitle", TITLE_HTML_TAGS, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_HTML_TAGS = {
++ {BUG_ID + "-3" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing another HTML tag. Another tag. A " +
++ "tag with attributes. <script and </p are not tags.)\";"
++ }
++ };
++ private static final String[][] NEG_TEST_HTML_TAGS = {
++ {BUG_ID + "-3" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing another <p>HTML</p> tag. Another " +
++ "<h1>tag</h1>. A <span id=\"testTag\">tag with attributes</span>. <script and " +
++ "</p are not tags.)\";"
++ }
++ };
++
++ //Window title using entities.
++ private static final String TITLE_HTML_ENTITIES =
++ "Testing entities &lt;script&gt;alert(\"Should not pop up\")&lt;/script&gt;.";
++ private static final String[] ARGS_HTML_ENTITIES = new String[]{
++ "-d", BUG_ID + "-4", "-windowtitle", TITLE_HTML_ENTITIES, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_HTML_ENTITIES = {
++ {BUG_ID + "-4" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing entities &lt;script&gt;alert(\\\"Should " +
++ "not pop up\\\")&lt;/script&gt;.)\";"
++ }
+ };
-+ private static final String[] ARGS = new String[]{
-+ "-d", BUG_ID, "-windowtitle", WIN_TITLE, "-sourcepath", SRC_DIR, "p1", "p2"
++ private static final String[][] NEG_TEST_HTML_ENTITIES = {
++ {BUG_ID + "-4" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing entities alert(\\\"Should not pop up\\\").)\";"
++ }
++ };
++
++ //Window title with just empty HTML tags.
++ private static final String TITLE_EMPTY_TAGS =
++ "</title><script></script>";
++ private static final String[] ARGS_EMPTY_TAGS = new String[]{
++ "-d", BUG_ID + "-5", "-windowtitle", TITLE_EMPTY_TAGS, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_EMPTY_TAGS = {
++ {BUG_ID + "-5" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview\";"
++ }
++ };
++ private static final String[][] NEG_TEST_EMPTY_TAGS = {
++ {BUG_ID + "-5" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (</title><script></script>)\";"
++ }
++ };
++
++ //Window title with unicode characters.
++ private static final String TITLE_UNICODE_CHARS =
++ "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e.";
++ private static final String[] ARGS_UNICODE_CHARS = new String[]{
++ "-d", BUG_ID + "-6", "-windowtitle", TITLE_UNICODE_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_UNICODE_CHARS = {
++ {BUG_ID + "-6" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing unicode alert(\\\"Should " +
++ "not pop up\\\").)\";"
++ }
++ };
++ private static final String[][] NEG_TEST_UNICODE_CHARS = {
++ {BUG_ID + "-6" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing unicode <script>alert(\\\"Should not pop up\\\")" +
++ "</script>.)\";"
++ }
++ };
++
++ //An empty window title.
++ private static final String TITLE_EMPTY =
++ "";
++ private static final String[] ARGS_EMPTY_TITLE = new String[]{
++ "-d", BUG_ID + "-7", "-windowtitle", TITLE_EMPTY, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] TEST_EMPTY = {
++ {BUG_ID + "-7" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview\";"
++ }
++ };
++
++ //Test doctitle.
++ private static final String[] ARGS_DOCTITLE = new String[]{
++ "-d", BUG_ID + "-8", "-doctitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++ private static final String[][] NEG_TEST_DOCTITLE = {
++ {BUG_ID + "-8" + FS + "overview-summary.html",
++ "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
++ "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
++ "also a tab and also a \\t special character another \\u0002 unicode)\";"
++ },
+ };
+
+ /**
@@ -75525,7 +65870,14 @@
+ */
+ public static void main(String[] args) {
+ TestWindowTitle tester = new TestWindowTitle();
-+ run(tester, ARGS, TEST, NEG_TEST);
++ run(tester, ARGS_JS_CHARS, TEST_JS_CHARS, NEG_TEST_JS_CHARS);
++ run(tester, ARGS_SCRIPT_TAG, TEST_SCRIPT_TAG, NEG_TEST_SCRIPT_TAG);
++ run(tester, ARGS_HTML_TAGS, TEST_HTML_TAGS, NEG_TEST_HTML_TAGS);
++ run(tester, ARGS_HTML_ENTITIES, TEST_HTML_ENTITIES, NEG_TEST_HTML_ENTITIES);
++ run(tester, ARGS_EMPTY_TAGS, TEST_EMPTY_TAGS, NEG_TEST_EMPTY_TAGS);
++ run(tester, ARGS_UNICODE_CHARS, TEST_UNICODE_CHARS, NEG_TEST_UNICODE_CHARS);
++ run(tester, ARGS_EMPTY_TITLE, TEST_EMPTY, NO_TEST);
++ run(tester, ARGS_DOCTITLE, NO_TEST, NEG_TEST_DOCTITLE);
+ tester.printSummary();
+ }
+
@@ -75544,7 +65896,7 @@
+ }
+}
--- langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 1969-12-31 16:00:00.000000000 -0800
-+++ langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 2013-12-01 11:13:46.000000000 -0800
++++ langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 2014-04-20 12:39:09.000000000 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -75574,7 +65926,7 @@
+public class C1 {
+}
--- langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 1969-12-31 16:00:00.000000000 -0800
-+++ langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 2013-12-01 11:13:46.000000000 -0800
++++ langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 2014-04-20 12:39:09.000000000 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
@@ -75604,7 +65956,7 @@
+public class C2 {
+}
--- langtools/test/tools/javac/4846262/Test.sh 2013-09-06 11:31:16.000000000 -0700
-+++ langtools/test/tools/javac/4846262/Test.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/4846262/Test.sh 2014-04-20 12:39:09.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75615,7 +65967,7 @@
;;
CYGWIN* )
--- langtools/test/tools/javac/6302184/T6302184.sh 2013-09-06 11:31:16.000000000 -0700
-+++ langtools/test/tools/javac/6302184/T6302184.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/6302184/T6302184.sh 2014-04-20 12:39:10.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75626,7 +65978,7 @@
;;
CYGWIN* )
--- langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 1969-12-31 16:00:00.000000000 -0800
-+++ langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 2013-12-01 11:13:46.000000000 -0800
++++ langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 2014-04-20 12:39:09.000000000 -0700
@@ -0,0 +1,92 @@
+
+/*
@@ -75721,7 +66073,7 @@
+ }
+}
--- langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2013-09-06 11:31:17.000000000 -0700
-+++ langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2014-04-20 12:39:10.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75732,7 +66084,7 @@
;;
Windows* )
--- langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2013-09-06 11:31:18.000000000 -0700
-+++ langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2014-04-20 12:39:09.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75743,7 +66095,7 @@
FS="/"
;;
--- langtools/test/tools/javac/MissingInclude.sh 2013-09-06 11:31:19.000000000 -0700
-+++ langtools/test/tools/javac/MissingInclude.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/MissingInclude.sh 2014-04-20 12:39:11.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75754,7 +66106,7 @@
;;
Windows* )
--- langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2013-09-06 11:31:20.000000000 -0700
-+++ langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2014-04-20 12:39:09.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75765,7 +66117,7 @@
FS="/"
;;
--- langtools/test/tools/javac/T5090006/compiler.sh 2013-09-06 11:31:20.000000000 -0700
-+++ langtools/test/tools/javac/T5090006/compiler.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/T5090006/compiler.sh 2014-04-20 12:39:09.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75776,7 +66128,7 @@
;;
Windows* )
--- langtools/test/tools/javac/apt.sh 2013-09-06 11:31:23.000000000 -0700
-+++ langtools/test/tools/javac/apt.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/apt.sh 2014-04-20 12:39:11.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75787,7 +66139,7 @@
PS=":"
FS="/"
--- langtools/test/tools/javac/constDebug/ConstDebug.sh 2013-09-06 11:31:24.000000000 -0700
-+++ langtools/test/tools/javac/constDebug/ConstDebug.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/constDebug/ConstDebug.sh 2014-04-20 12:39:09.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75798,7 +66150,7 @@
FS="/"
;;
--- langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2013-09-06 11:31:28.000000000 -0700
-+++ langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2014-04-20 12:39:10.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75809,7 +66161,7 @@
;;
CYGWIN* )
--- langtools/test/tools/javac/innerClassFile/Driver.sh 2013-09-06 11:31:33.000000000 -0700
-+++ langtools/test/tools/javac/innerClassFile/Driver.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/innerClassFile/Driver.sh 2014-04-20 12:39:10.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75820,7 +66172,7 @@
;;
Windows* )
--- langtools/test/tools/javac/javazip/Test.sh 2013-09-06 11:31:33.000000000 -0700
-+++ langtools/test/tools/javac/javazip/Test.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/javazip/Test.sh 2014-04-20 12:39:10.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75831,7 +66183,7 @@
SCR=`pwd`
;;
--- langtools/test/tools/javac/links/links.sh 2013-09-06 11:31:33.000000000 -0700
-+++ langtools/test/tools/javac/links/links.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/links/links.sh 2014-04-20 12:39:09.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75842,7 +66194,7 @@
PS=":"
FS="/"
--- langtools/test/tools/javac/newlines/Newlines.sh 2013-09-06 11:31:34.000000000 -0700
-+++ langtools/test/tools/javac/newlines/Newlines.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/newlines/Newlines.sh 2014-04-20 12:39:09.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75853,7 +66205,7 @@
;;
Windows* )
--- langtools/test/tools/javac/stackmap/T4955930.sh 2013-09-06 11:31:36.000000000 -0700
-+++ langtools/test/tools/javac/stackmap/T4955930.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/stackmap/T4955930.sh 2014-04-20 12:39:10.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75864,7 +66216,7 @@
;;
Windows_95 | Windows_98 | Windows_NT )
--- langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2013-09-06 11:31:36.000000000 -0700
-+++ langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2014-04-20 12:39:09.000000000 -0700
@@ -55,7 +55,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75875,7 +66227,7 @@
then
ENV="env LANG=en_US.UTF-8"
--- langtools/test/tools/javah/6257087/foo.sh 2013-09-06 11:31:38.000000000 -0700
-+++ langtools/test/tools/javah/6257087/foo.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javah/6257087/foo.sh 2014-04-20 12:39:11.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75886,7 +66238,7 @@
FS="/"
;;
--- langtools/test/tools/javah/ConstMacroTest.sh 2013-09-06 11:31:38.000000000 -0700
-+++ langtools/test/tools/javah/ConstMacroTest.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javah/ConstMacroTest.sh 2014-04-20 12:39:11.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75897,7 +66249,7 @@
FS="/"
;;
--- langtools/test/tools/javah/MissingParamClassTest.sh 2013-09-06 11:31:38.000000000 -0700
-+++ langtools/test/tools/javah/MissingParamClassTest.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javah/MissingParamClassTest.sh 2014-04-20 12:39:11.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75908,7 +66260,7 @@
FS="/"
;;
--- langtools/test/tools/javah/ReadOldClass.sh 2013-09-06 11:31:38.000000000 -0700
-+++ langtools/test/tools/javah/ReadOldClass.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javah/ReadOldClass.sh 2014-04-20 12:39:11.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -75919,7 +66271,7 @@
FS="/"
;;
--- langtools/test/tools/javap/pathsep.sh 2013-09-06 11:31:39.000000000 -0700
-+++ langtools/test/tools/javap/pathsep.sh 2014-01-18 12:16:11.000000000 -0800
++++ langtools/test/tools/javap/pathsep.sh 2014-04-20 12:39:11.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`
diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-net-PortConfig.java b/java/openjdk7/files/patch-src-solaris-classes-sun-net-PortConfig.java
deleted file mode 100644
index 0fe8a001cdf5..000000000000
--- a/java/openjdk7/files/patch-src-solaris-classes-sun-net-PortConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- jdk/src/solaris/classes/sun/net/PortConfig.java Sat Jan 18 12:20:24 2014 -0800
-+++ jdk/src/solaris/classes/sun/net/PortConfig.java Sat Feb 15 14:31:26 2014 -0800
-@@ -52,7 +52,7 @@
- } else if (os.startsWith("SunOS")) {
- defaultLower = 32768;
- defaultUpper = 65535;
-- } else if (os.contains("OS X")) {
-+ } else if (os.contains("OS X") || os.endsWith("BSD")) {
- defaultLower = 49152;
- defaultUpper = 65535;
- } else {
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-02 22:58:12 +0000